修改 异常上报

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YcsbController.java

@@ -137,6 +137,17 @@ public class YcsbController extends BaseController
         return toAjax(ycsbService.insertYcsb(ycsb));
     }
 
+    /**
+     * 新增抗原异常上报
+     */
+//    @PreAuthorize("@ss.hasPermi('system:ycsb:add')")
+    @Log(title = "抗原异常上报", businessType = BusinessType.INSERT)
+    @PostMapping("/addMobile")
+    public AjaxResult addMobile(@RequestBody Ycsb ycsb)
+    {
+        return toAjax(ycsbService.insertYcsb(ycsb));
+    }
+
     /**
      * 修改抗原异常上报
      */
@@ -172,7 +183,7 @@ public class YcsbController extends BaseController
         String[] hasAcid = new String[]{"是", "否"};
         ExcelUtil.setClassExcelAttribute( clazz,"hasAcid","combo",hasAcid);
         //设置文本格式表头在第几列
-        String columes = "3";
+        String columes = "4";
         util.importTemplateExcelSetHead(response,"抗原异常上报",columes);
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,6 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/system/ycsb/addMobile").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/domain/Ycsb.java

@@ -29,6 +29,10 @@ public class Ycsb extends BaseEntity
     @Excel(name = "姓名")
     private String userName;
 
+    /** 抗原结果 */
+    @Excel(name = "抗原结果",readConverterExp = "0=异常,1=正常")
+    private String kyResult;
+
     /** 是否做核酸 */
     @Excel(name = "是否做核酸")
     private String hasAcid;
@@ -76,6 +80,10 @@ public class Ycsb extends BaseEntity
     @Excel(name = "家庭现住址")
     private String address;
 
+    /** 是否已处理 */
+    @Excel(name = "是否已处理",readConverterExp = "0=已处理,1=未处理",type = Excel.Type.EXPORT)
+    private String isHandle;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remark;
@@ -285,4 +293,20 @@ public class Ycsb extends BaseEntity
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getKyResult() {
+        return kyResult;
+    }
+
+    public void setKyResult(String kyResult) {
+        this.kyResult = kyResult;
+    }
+
+    public String getIsHandle() {
+        return isHandle;
+    }
+
+    public void setIsHandle(String isHandle) {
+        this.isHandle = isHandle;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YcsbServiceImpl.java

@@ -219,6 +219,7 @@ public class YcsbServiceImpl implements IYcsbService
                     ycsbMapper.updateYcsb(ycsb);
                     continue;
                 }
+                ycsb.setIsHandle("0");
                 ycsbMapper.insertYcsb(ycsb);
             }
         }

ruoyi-system/src/main/resources/mapper/system/YcsbMapper.xml

@@ -26,6 +26,8 @@
         <result property="building" column="building"/>
         <result property="house" column="house"/>
         <result property="checkCard" column="check_card"/>
+        <result property="kyResult" column="ky_result"/>
+        <result property="isHandle" column="is_handle"/>
     </resultMap>
 
     <sql id="selectYcsbVo">
@@ -46,13 +48,14 @@
                create_time,
                update_by,
                update_time,
-               remark,address,house,building,check_card
+               remark,address,house,building,check_card,is_handle,ky_result
         from ycsb
     </sql>
 
     <select id="selectYcsbList" parameterType="Ycsb" resultMap="YcsbResult">
         select a.id, a.sb_date, a.user_name, a.card_no, a.phone, a.area, a.street,a.committee, a.community, a.unit,a.check_card,
-        a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.address,a.house,a.building
+        a.has_acid, a.status, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,a.address,a.house,
+               a.building,a.is_handle,a.ky_result
         from ycsb a
         left join sys_user u on u.user_id = a.create_by
         left join sys_dept d on u.dept_id = d.dept_id
@@ -106,6 +109,8 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="checkCard != null">check_card,</if>
+            <if test="isHandle != null">is_handle,</if>
+            <if test="kyResult != null">ky_result,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sbDate != null">#{sbDate},</if>
@@ -129,6 +134,8 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="checkCard != null">#{checkCard},</if>
+            <if test="isHandle != null">#{isHandle},</if>
+            <if test="kyResult != null">#{kyResult},</if>
         </trim>
     </insert>
 
@@ -156,6 +163,8 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="checkCard != null">check_card = #{checkCard},</if>
+            <if test="isHandle != null">is_handle = #{isHandle},</if>
+            <if test="kyResult != null">ky_result = #{kyResult},</if>
         </trim>
         where id = #{id}
     </update>