防疫监控子系统

business-system/face-identify/src/main/java/com/pj/biz/TbPersonVisitRecordController.java

@@ -42,6 +42,15 @@ public class TbPersonVisitRecordController {
         tbPersonVisitRecordService.add(t);
         return AjaxJson.getSuccessData(t);
     }
+    /**
+     * 健康码记录-增
+     */
+    @RequestMapping("addHealthRecord")
+    @SaCheckPermission(TbPersonVisitRecord.PERMISSION_CODE_HEALTH_ADD)
+    public AjaxJson addHealthRecord(VisitAddBO t) {
+        tbPersonVisitRecordService.add(t);
+        return AjaxJson.getSuccessData(t);
+    }
 
     /**
      * 删
@@ -52,6 +61,15 @@ public class TbPersonVisitRecordController {
         tbPersonVisitRecordService.delete(id);
         return AjaxJson.getSuccess();
     }
+    /**
+     * 健康码记录-删除
+     */
+    @RequestMapping("deleteHealthRecord")
+    @SaCheckPermission(TbPersonVisitRecord.PERMISSION_CODE_HEALTH_DELETE)
+    public AjaxJson deleteHealthRecord(Long id) {
+        tbPersonVisitRecordService.delete(id);
+        return AjaxJson.getSuccess();
+    }
 
 
 
@@ -60,6 +78,15 @@ public class TbPersonVisitRecordController {
      */
     @RequestMapping("update")
     @SaCheckPermission(TbPersonVisitRecord.PERMISSION_CODE)
+    public AjaxJson updateHealthRecord(TbPersonVisitRecord t) {
+        tbPersonVisitRecordService.update(t);
+        return AjaxJson.getSuccess();
+    }
+    /**
+     * 健康码记录-改
+     */
+    @RequestMapping("updateHealthRecord")
+    @SaCheckPermission(TbPersonVisitRecord.PERMISSION_CODE_HEALTH_EDIT)
     public AjaxJson update(TbPersonVisitRecord t) {
         tbPersonVisitRecordService.update(t);
         return AjaxJson.getSuccess();
@@ -94,5 +121,13 @@ public class TbPersonVisitRecordController {
         return AjaxJson.getSuccessData(tbPersonVisitRecordService.export(soMap));
     }
 
+    @RequestMapping("solve")
+    @SaCheckPermission(TbPersonVisitRecord.PERMISSION_CODE_UN_HEALTH_SOLVE)
+    public AjaxJson solve() {
+        SoMap soMap = SoMap.getRequestSoMap();
+        tbPersonVisitRecordService.solve(soMap);
+        return AjaxJson.getSuccess();
+    }
+
 
 }

business-system/venues-system/src/main/java/com/pj/biz/TbVenuesController.java

@@ -78,6 +78,10 @@ public class TbVenuesController {
     @RequestMapping("getList")
     public AjaxJson getList() {
         SoMap so = SoMap.getRequestSoMap();
+        String deptId = StpUserUtil.getDeptId();
+        if (!StrUtil.equals(String.valueOf(StpUserUtil.ADMIN_DEPT_ID), deptId)) {
+            so.put("deptId", deptId);
+        }
         List<TbVenues> list = tbVenuesService.getList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);
     }

sp-core/src/main/java/com/pj/project/tb_dept/TbDept.java

@@ -43,7 +43,7 @@ public class TbDept extends Model<TbDept> implements Serializable {
 	 * 主键 
 	 */
 	@TableId(type = IdType.AUTO)
-	private Long id;	
+	private Long id;
 
 	/**
 	 * 名称 

sp-core/src/main/java/com/pj/project/tb_dept/TbDeptController.java

@@ -89,7 +89,7 @@ public class TbDeptController {
         SoMap so = SoMap.getRequestSoMap();
         String deptId = StpUserUtil.getDeptId();
         if (!StrUtil.equals(String.valueOf(StpUserUtil.ADMIN_DEPT_ID), deptId)) {
-            so.put("deptId", deptId);
+            so.put("id", deptId);
         }
 //        if (StpUserUtil.ADMIN_DEPT_ID != deptId) {
 //            so.put("id", deptId);

sp-core/src/main/java/com/pj/project/tb_manager/TbManager.java

@@ -1,6 +1,9 @@
 package com.pj.project.tb_manager;
 
 import java.io.Serializable;
+import java.sql.Time;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.EqualsAndHashCode;
@@ -30,7 +33,11 @@ public class TbManager extends Model<TbManager> implements Serializable {
 	/**
 	 * 此模块对应的权限码 
 	 */
-	public static final String PERMISSION_CODE = "tb-manager";	
+	//public static final String PERMISSION_CODE = "tb-manager";
+    public static final String PERMISSION_CODE_LIST = "tb-manager-list";
+    public static final String PERMISSION_CODE_ADD = "tb-manager-add";
+    public static final String PERMISSION_CODE_DEL = "tb-manager-del";
+    public static final String PERMISSION_CODE_EDIT = "tb-manager-edit";
 
 
 	// ---------- 表中字段 ----------
@@ -53,7 +60,8 @@ public class TbManager extends Model<TbManager> implements Serializable {
 	/**
 	 * 部门ID 
 	 */
-	private Long deptId;	
+	private String deptId;
+    private String deptName;
 
 	/**
 	 * 职能 
@@ -63,32 +71,32 @@ public class TbManager extends Model<TbManager> implements Serializable {
 	/**
 	 * 场所ID 
 	 */
-	private Long venuesId;	
+	private String venuesId;
 
 	/**
 	 * 值班地点 
 	 */
-	private String venuesName;	
+	private String venuesName;
 
 	/**
 	 * 值班开始时间 
 	 */
-	private String workStartTime;	
+	private String workStartTime;
 
 	/**
 	 * 值班结束时间 
 	 */
-	private String workEndTime;	
+	private String workEndTime;
 
 	/**
 	 * 备注 
 	 */
-	private String remark;	
+	private String remark;
 
 	/**
 	 * 创建时间 
 	 */
-	private String createTime;	
+	private Date createTime;
 
 	/**
 	 * 创建人 
@@ -98,7 +106,7 @@ public class TbManager extends Model<TbManager> implements Serializable {
 	/**
 	 * 更新时间 
 	 */
-	private String updateTime;	
+	private Date updateTime;
 
 	/**
 	 * 更新人 

sp-core/src/main/java/com/pj/project/tb_manager/TbManagerController.java

@@ -2,6 +2,7 @@ package com.pj.project.tb_manager;
 
 import java.util.List;
 
+import cn.hutool.core.util.StrUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -26,53 +27,57 @@ public class TbManagerController {
 @Autowired
 TbManagerService tbManagerService;
 
-/** 增 */
-@RequestMapping("add")
-	@SaCheckPermission(TbManager.PERMISSION_CODE)
-@Transactional(rollbackFor = Exception.class)
-public AjaxJson add(TbManager t){
-tbManagerService.add(t);
-return AjaxJson.getSuccessData(t);
-}
-
-/** 删 */
-@RequestMapping("delete")
-	@SaCheckPermission(TbManager.PERMISSION_CODE)
-public AjaxJson delete(Long id){
-tbManagerService.delete(id);
-return AjaxJson.getSuccess();
-}
-
-/** 删 - 根据id列表 */
-@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbManager.PERMISSION_CODE)
-public AjaxJson deleteByIds(){
-List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
-	int line = SP.publicMapper.deleteByIds(TbManager.TABLE_NAME, ids);
-	return AjaxJson.getByLine(line);
+    /** 增 */
+    @RequestMapping("add")
+    @SaCheckPermission(TbManager.PERMISSION_CODE_ADD)
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxJson add(TbManager t){
+        tbManagerService.add(t);
+        return AjaxJson.getSuccessData(t);
+    }
+
+    /** 删 */
+    @RequestMapping("delete")
+    @SaCheckPermission(TbManager.PERMISSION_CODE_DEL)
+    public AjaxJson delete(Long id){
+        tbManagerService.delete(id);
+        return AjaxJson.getSuccess();
+    }
+
+    /** 删 - 根据id列表 */
+    @RequestMapping("deleteByIds")
+	@SaCheckPermission(TbManager.PERMISSION_CODE_DEL)
+    public AjaxJson deleteByIds(){
+        List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+        int line = SP.publicMapper.deleteByIds(TbManager.TABLE_NAME, ids);
+        return AjaxJson.getByLine(line);
 	}
 
 	/** 改 */
 	@RequestMapping("update")
-		@SaCheckPermission(TbManager.PERMISSION_CODE)
+    @SaCheckPermission(TbManager.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbManager t){
 		tbManagerService.update(t);
-	return AjaxJson.getSuccess();
+	    return AjaxJson.getSuccess();
 	}
 
 	/** 查 - 根据id */
 	@RequestMapping("getById")
 	public AjaxJson getById(Long id){
-	TbManager t = tbManagerService.getById(id);
-	return AjaxJson.getSuccessData(t);
+        TbManager t = tbManagerService.getById(id);
+        return AjaxJson.getSuccessData(t);
 	}
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 	public AjaxJson getList() {
-	SoMap so = SoMap.getRequestSoMap();
+	    SoMap so = SoMap.getRequestSoMap();
+        String deptId = StpUserUtil.getDeptId();
+        if (!StrUtil.equals(String.valueOf(StpUserUtil.ADMIN_DEPT_ID), deptId)) {
+            so.put("deptId", deptId);
+        }
 		List<TbManager> list = tbManagerService.getList(so.startPage());
-	return AjaxJson.getPageData(so.getDataCount(), list);
+	    return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 
 

sp-core/src/main/java/com/pj/project/tb_manager/TbManagerMapper.xml

@@ -39,7 +39,7 @@
 						<if test=' this.has("id") '> and id = #{id} </if>
 			<if test=' this.has("name") '> and name = #{name} </if>
 			<if test=' this.has("phone") '> and phone = #{phone} </if>
-			<if test=' this.has("deptId") '> and dept_id = #{deptId} </if>
+            <if test=' this.has("deptId") '> and dept_id in (${deptId}) </if>
 			<if test=' this.has("position") '> and position = #{position} </if>
 			<if test=' this.has("venuesId") '> and venues_id = #{venuesId} </if>
 			<if test=' this.has("venuesName") '> and venues_name = #{venuesName} </if>

sp-core/src/main/java/com/pj/project/tb_manager/TbManagerService.java

@@ -1,28 +1,39 @@
 package com.pj.project.tb_manager;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pj.current.satoken.StpUserUtil;
+import com.pj.project.tb_dept.TbDept;
+import com.pj.project.tb_dept.TbDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.pj.utils.so.*;
 
+import javax.annotation.Resource;
+
 /**
  * Service: tb_manager -- 防疫人员
  * @author qzyReal 
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class TbManagerService extends ServiceImpl<TbManagerMapper, TbManager> implements IService<TbManager>{
 
 	/** 底层 Mapper 对象 */
-	@Autowired
+	@Resource
 	TbManagerMapper tbManagerMapper;
+    @Resource
+    TbDeptService tbDeptService;
+
 
 
 	/** 增 */
 	void add(TbManager t){
-	this.save( t);
+        t.setCreateTime(new Date());
+	    this.save( t);
 	}
 
 	/** 删 */
@@ -32,7 +43,8 @@ public class TbManagerService extends ServiceImpl<TbManagerMapper, TbManager> im
 
 	/** 改 */
 	void update(TbManager t){
-	this.updateById(t);
+	    t.setUpdateTime(new Date());
+	    this.updateById(t);
 	}
 
 	/** 查 */

sp-core/src/main/java/com/pj/project/tb_manager/TbManagerUtil.java

@@ -1,71 +0,0 @@
-package com.pj.project.tb_manager;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.pj.utils.sg.*;
-
-/**
- * 工具类：tb_manager -- 防疫人员
- * @author qzyReal 
- *
- */
-@Component
-public class TbManagerUtil {
-
-	
-	/** 底层 Mapper 对象 */
-	public static TbManagerMapper tbManagerMapper;
-	@Autowired
-	private void setTbManagerMapper(TbManagerMapper tbManagerMapper) {
-		TbManagerUtil.tbManagerMapper = tbManagerMapper;
-	}
-	
-	
-	/** 
-	 * 将一个 TbManager 对象进行进行数据完整性校验 (方便add/update等接口数据校验) [G] 
-	 */
-	static void check(TbManager t) {
-		AjaxError.throwByIsNull(t.getId(), "[主键] 不能为空");		// 验证: 主键 
-		AjaxError.throwByIsNull(t.getName(), "[姓名] 不能为空");		// 验证: 姓名 
-		AjaxError.throwByIsNull(t.getPhone(), "[联系号码] 不能为空");		// 验证: 联系号码 
-		AjaxError.throwByIsNull(t.getDeptId(), "[部门ID] 不能为空");		// 验证: 部门ID 
-		AjaxError.throwByIsNull(t.getPosition(), "[职能] 不能为空");		// 验证: 职能 
-		AjaxError.throwByIsNull(t.getVenuesId(), "[场所ID] 不能为空");		// 验证: 场所ID 
-		AjaxError.throwByIsNull(t.getVenuesName(), "[值班地点] 不能为空");		// 验证: 值班地点 
-		AjaxError.throwByIsNull(t.getWorkStartTime(), "[值班开始时间] 不能为空");		// 验证: 值班开始时间 
-		AjaxError.throwByIsNull(t.getWorkEndTime(), "[值班结束时间] 不能为空");		// 验证: 值班结束时间 
-		AjaxError.throwByIsNull(t.getRemark(), "[备注] 不能为空");		// 验证: 备注 
-		AjaxError.throwByIsNull(t.getCreateTime(), "[创建时间] 不能为空");		// 验证: 创建时间 
-		AjaxError.throwByIsNull(t.getCreateBy(), "[创建人] 不能为空");		// 验证: 创建人 
-		AjaxError.throwByIsNull(t.getUpdateTime(), "[更新时间] 不能为空");		// 验证: 更新时间 
-		AjaxError.throwByIsNull(t.getUpdateBy(), "[更新人] 不能为空");		// 验证: 更新人 
-	}
-
-	/** 
-	 * 获取一个TbManager (方便复制代码用) [G] 
-	 */ 
-	static TbManager getTbManager() {
-		TbManager t = new TbManager();	// 声明对象 
-		t.setId(0L);		// 主键 
-		t.setName("");		// 姓名 
-		t.setPhone("");		// 联系号码 
-		t.setDeptId(0L);		// 部门ID 
-		t.setPosition("");		// 职能 
-		t.setVenuesId(0L);		// 场所ID 
-		t.setVenuesName("");		// 值班地点 
-		t.setWorkStartTime("");		// 值班开始时间 
-		t.setWorkEndTime("");		// 值班结束时间 
-		t.setRemark("");		// 备注 
-		t.setCreateTime("");		// 创建时间 
-		t.setCreateBy("");		// 创建人 
-		t.setUpdateTime("");		// 更新时间 
-		t.setUpdateBy("");		// 更新人 
-		return t;
-	}
-	
-	
-	
-	
-	
-}

sp-core/src/main/java/com/pj/project/tb_person_visit_record/TbPersonVisitRecord.java

@@ -41,6 +41,10 @@ public class TbPersonVisitRecord extends Model<TbPersonVisitRecord> implements S
     public static final String PERMISSION_CODE_EDIT = "tb-person-visit-record-edit";
     public static final String PERMISSION_CODE_ADD = "tb-person-visit-record-add";
     public static final String PERMISSION_CODE_EXPORT = "tb-person-visit-record-export";
+    public static final String PERMISSION_CODE_HEALTH_ADD = "health-code-record-add";
+    public static final String PERMISSION_CODE_HEALTH_EDIT = "health-code-record-edit";
+    public static final String PERMISSION_CODE_HEALTH_DELETE = "health-code-record-del";
+    public static final String PERMISSION_CODE_UN_HEALTH_SOLVE = "health-code-record-solve";
 
 
     // ---------- 表中字段 ----------
@@ -125,6 +129,14 @@ public class TbPersonVisitRecord extends Model<TbPersonVisitRecord> implements S
      */
     private String deptName;
 
+    private Integer isNotify;
+
+    private String remark;
+
+    private Integer IsSolve;
+
+    private String way;
+
     @TableField(exist = false)
     private String idCadStr;
 
@@ -153,6 +165,17 @@ public class TbPersonVisitRecord extends Model<TbPersonVisitRecord> implements S
         private String desc;
     }
 
+    @Getter
+    @AllArgsConstructor
+    public static enum HealthEnum {
+        GREEN("绿码", "绿码"),
+        RED("红码", "红码"),
+        YELLOW("黄码", "黄码");
+
+        private String status;
+        private String desc;
+    }
+
 
     public String getIdCadStr() {
         String str = IdcardUtil.getBirthByIdCard(idCard);

sp-core/src/main/java/com/pj/project/tb_person_visit_record/TbPersonVisitRecordMapper.xml

@@ -22,6 +22,7 @@
 				<result property="sn" column="sn" />
 				<result property="visitDate" column="visit_date" />
 				<result property="createTime" column="create_time" />
+                <result property="isNotify" column="is_notify" />
 		</resultMap>
 
 	<!-- 公共查询sql片段 -->
@@ -51,7 +52,11 @@
 			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
 			<if test=' this.has("startTime") '> and date_format(visit_date,'%Y-%m-%d %H:%i:%s') &gt;= #{startTime} </if>
 			<if test=' this.has("endTime") '> and date_format(visit_date,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime} </if>
-		</where>
+            <if test=' this.has("unhealthy") '> and health_status != '绿码' </if>
+            <if test='dataType == 0'> and health_status = '绿码' </if>
+            <if test='dataType == 1'> and health_status != '绿码' </if>
+
+        </where>
 		order by
 		<choose>
 						<when test='sortType == 1'> id desc </when>

sp-core/src/main/java/com/pj/project/tb_person_visit_record/TbPersonVisitRecordService.java

@@ -80,6 +80,11 @@ public class TbPersonVisitRecordService extends ServiceImpl<TbPersonVisitRecordM
         } else if (direction.equals(TbPersonVisitRecord.DirectionEnum.OUT.getDirection())) {
             record.setVisitDate(t.getOutTime()).setTemperature(t.getOutTemperature());
         }
+        if(StrUtil.equals(record.getHealthStatus(), TbPersonVisitRecord.HealthEnum.GREEN.getStatus())){
+            record.setWay("无需处置").setIsSolve(0).setIsNotify(0);
+        }else{
+            record.setIsSolve(1).setIsNotify(1);
+        }
         this.save(record);
     }
 
@@ -150,4 +155,13 @@ public class TbPersonVisitRecordService extends ServiceImpl<TbPersonVisitRecordM
         List<TbPersonVisitRecord> list = list(ew);
         return list.isEmpty() ? null : list.get(0);
     }
+
+    public void solve(SoMap so){
+        String id = so.getString("id");
+        String way = so.getString("way");
+        TbPersonVisitRecord t = getById(id);
+        t.setWay(way).setIsSolve(2);
+        this.updateById(t);
+    }
+
 }

sp-core/src/main/java/com/pj/project/tb_venues/TbVenuesMapper.xml

@@ -33,6 +33,7 @@
 		<where>
 			<if test=' this.has("deptName") '> and dept_name = #{deptName} </if>
 			<if test=' this.has("deptId") '> and dept_id in (${deptId}) </if>
+            <if test=' this.has("pId") '> and p_id = #{pId} </if>
 			<if test=' this.has("name") '> and name like concat('%', #{name},'%') and p_id=-1 </if>
 		</where>
 		order by