楼盘日志添加

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
@@ -18,6 +19,7 @@ import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.service.ITaSaveService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -63,6 +65,9 @@ public class TaBuildingController extends BaseController {
     @Autowired
     ITaPersonBuildingService taPersonBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
+
 
     /**
      * 楼盘详情
@@ -161,7 +166,27 @@ public class TaBuildingController extends BaseController {
     })
     @PutMapping("/admin/building/update")
     public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingUpdate(parameter, getOrgId(request));
+        ResponseBean responseBean = taBuildingService.buildingUpdate(parameter, getOrgId(request));
+        JSONObject object = JSONObject.parseObject(parameter);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
+        iSceneLogService.saveLogs(getUserId(request),"building",building.getBuildingId());
+        return responseBean;
+    }
+
+    /**
+     * 获取项目更新日志
+     */
+    @ApiOperation(value = "获取项目更新日志", notes = "获取项目更新日志")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "buildingId", value = "项目id"),
+    })
+    @GetMapping("/admin/building/logs")
+    public ResponseBean buildingUpdate(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId, HttpServletRequest request) {
+        return iSceneLogService.getBuildingLogs(pageNum,pageSize,buildingId, getTaPersonBuildingListByUserId(request), getInstitutionIds(request));
     }
 
     /**

src/main/java/com/yunzhi/marketing/xlk/controller/SceneLogController.java

@@ -0,0 +1,153 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 业务日志记录表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "", tags = "xlk-")
+public class SceneLogController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SceneLogController.class);
+
+    @Autowired
+    public ISceneLogService iSceneLogService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog",method= RequestMethod.GET)
+    public ResponseBean sceneLogList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<SceneLog> pg = new Page<>(pageNum, pageSize);
+            LambdaQueryWrapper<SceneLog> queryWrapper = new LambdaQueryWrapper<>();
+
+            IPage<SceneLog> result = iSceneLogService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param sceneLog 实体对象
+     * @return
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog",method= RequestMethod.POST)
+    public ResponseBean sceneLogAdd(@RequestBody SceneLog sceneLog, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSceneLogService.save(sceneLog)){
+                responseBean.addSuccess(sceneLog);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "", notes = "")
+    @ResponseBody
+    @RequestMapping(value="/sceneLog/{id}", method= RequestMethod.DELETE)
+    public ResponseBean sceneLogDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iSceneLogService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sceneLog 实体对象
+     * @return
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog/{id}",method= RequestMethod.PUT)
+    public ResponseBean sceneLogUpdate(@PathVariable String id,
+                                       @RequestBody SceneLog sceneLog, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iSceneLogService.updateById(sceneLog)){
+                responseBean.addSuccess(sceneLog);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "", notes = "")
+    @RequestMapping(value="/sceneLog/{id}",method= RequestMethod.GET)
+    public ResponseBean sceneLogGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iSceneLogService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sceneLogDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/entity/SceneLog.java

@@ -0,0 +1,66 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 业务日志记录表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_scene_log")
+public class SceneLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织结构id
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+
+    /**
+     * 日志类型
+     */
+    private String type;
+
+    /**
+     * 日志主键
+     */
+    private String uuid;
+
+    /**
+     * 更新人
+     */
+    private String updateId;
+
+    /**
+     * 更新人姓名
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新内容
+     */
+    private String content;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/SceneLogMapper.java

@@ -0,0 +1,26 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+import com.yunzhi.marketing.xlk.vo.BuildingLogVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 业务日志记录表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@Mapper
+public interface SceneLogMapper extends BaseMapper<SceneLog> {
+
+    List<BuildingLogVO> getBuildingLogs(Page<BuildingLogVO> page, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList, @Param("institutionIds") List<String> institutionIds);
+}

src/main/java/com/yunzhi/marketing/xlk/service/ISceneLogService.java

@@ -0,0 +1,23 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 业务日志记录表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+public interface ISceneLogService extends IService<SceneLog> {
+
+    void saveLogs(Integer userId, String type, String uuid);
+
+    ResponseBean getBuildingLogs(Integer pageNum, Integer pageSize, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, List<String> institutionIds);
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/SceneLogServiceImpl.java

@@ -0,0 +1,52 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
+import com.yunzhi.marketing.entity.TaBuilding;
+import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.xlk.entity.SceneLog;
+import com.yunzhi.marketing.xlk.mapper.SceneLogMapper;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
+import com.yunzhi.marketing.xlk.vo.BuildingLogVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务日志记录表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-10-08
+ */
+@Service
+public class SceneLogServiceImpl extends ServiceImpl<SceneLogMapper, SceneLog> implements ISceneLogService {
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Override
+    public void saveLogs(Integer userId, String type, String uuid) {
+        TaUser taUser = taUserMapper.selectById(userId);
+        SceneLog sceneLog = new SceneLog();
+        sceneLog.setType(type);
+        sceneLog.setUuid(uuid);
+        sceneLog.setUpdateId(String.valueOf(userId));
+        sceneLog.setUpdateName(taUser.getUserName());
+        sceneLog.setUpdateTime(LocalDateTime.now());
+        this.baseMapper.insert(sceneLog);
+    }
+
+    @Override
+    public ResponseBean getBuildingLogs(Integer pageNum, Integer pageSize, String buildingId, List<TaPersonBuilding> taPersonBuildingList, List<String> InstitutionIds) {
+        Page<BuildingLogVO> page = new Page<>(pageNum, pageSize);
+        List<BuildingLogVO> buildings = this.baseMapper.getBuildingLogs(page, buildingId, taPersonBuildingList, InstitutionIds);
+        return ResponseBean.success(page);
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/vo/BuildingLogVO.java

@@ -0,0 +1,41 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class BuildingLogVO {
+
+    /**
+     * 组织结构id
+     */
+    private String id;
+
+    /**
+     * 更新人
+     */
+    private String updateId;
+
+    /**
+     * 更新人姓名
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+}

src/main/resources/mapper/xlk/SceneLogMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.marketing.xlk.mapper.SceneLogMapper">
+
+    <select id="getBuildingLogs" resultType="com.yunzhi.marketing.xlk.vo.BuildingLogVO">
+        SELECT
+            t.id,
+            t.update_id,
+            t.update_name,
+            t.update_time,
+            b.building_id,
+            b.building_name
+        FROM
+            xlk_scene_log t
+            LEFT JOIN ta_building b ON t.uuid = b.building_id
+            AND t.type = "building"
+        WHERE
+            1 = 1
+        <if test="buildingId != null and buildingId != ''">
+            and b.building_id = #{buildingId}
+        </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND b.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND b.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+    </select>
+</mapper>