Merge remote-tracking branch 'origin/master'

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

@@ -137,6 +137,18 @@ 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)
+    {
+        ycsb.setSource("1");
+        return toAjax(ycsbService.insertYcsb(ycsb));
+    }
+
     /**
      * 修改抗原异常上报
      */
@@ -172,7 +184,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;
@@ -86,6 +94,8 @@ public class Ycsb extends BaseEntity
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
+    /** 来源（0管理端 1移动端） */
+    private String source;
 
     /** 创建时间 */
     // 新增于2022-11-30
@@ -285,4 +295,28 @@ 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;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
 }

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/FcryMapper.xml

@@ -128,7 +128,6 @@
                a.check_card,
                a.is_positive,
                a.positive_only,
-               a.other_point_time,
                a.people_type,
                a.other_fc_time,
                a.other_gld_time

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>

ruoyi-ui/src/permission.js

@@ -11,6 +11,11 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/kfInfoAdd']
 
 router.beforeEach((to, from, next) => {
+  if (to.meta.browserTitle) {
+    document.title = to.meta.browserTitle
+  } else {
+    document.title = '高新区数据管理系统' //此处写默认的title
+  }
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)

ruoyi-ui/src/router/index.js

@@ -49,7 +49,10 @@ export const constantRoutes = [
   {
     path: '/kfInfoAdd',
     component: () => import('@/views/kfInfoAdd'),
-    hidden: true
+    hidden: true,
+    meta: {
+      browserTitle: '抗原异常信息填报'
+    }
   },
   {
     path: '/register',

ruoyi-ui/src/views/kfInfoAdd.vue

@@ -25,8 +25,8 @@
 <!--    </el-row>-->
 <!--    <el-row>-->
 <!--      <el-col :span="12">-->
-        <el-form-item label="抗原结果" prop="AntigenResults">
-          <el-radio-group v-model="form.AntigenResults">
+        <el-form-item label="抗原结果" prop="kyResult">
+          <el-radio-group v-model="form.kyResult">
             <el-radio :label="'0'">异常</el-radio>
 <!--            <el-radio :label="'1'">正常</el-radio>-->
           </el-radio-group>
@@ -407,7 +407,8 @@ name: "kfInfoAdd",
       sbDate: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
       userName: null,
       cardNo: null,
-      AntigenResults: '0',
+      kyResult: '0',
+      isHandle: '1',
       phone: null,
       area: '1',
       street: null,
@@ -511,7 +512,8 @@ name: "kfInfoAdd",
         sbDate: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         userName: null,
         cardNo: null,
-        AntigenResults: '0',
+        kyResult: '0',
+        isHandle: '1',
         phone: null,
         area: '1',
         street: null,
@@ -537,10 +539,32 @@ name: "kfInfoAdd",
   right: 19%!important;
   width: 235px!important;
 }
+.el-select-dropdown__item{
+  font-size: 20px!important;
+}
 </style>
 <style scoped lang="scss">
 .kfInfoAdd-module{
   padding: 20px;
+  ::v-deep.el-form-item{
+    margin-bottom: 25px!important;
+  }
+  ::v-deep.el-form-item__error{
+    font-size: 20px!important;
+  }
+  ::v-deep.el-form-item__label{
+    font-size: 20px!important;
+  }
+  ::v-deep.el-input--medium{
+    font-size: 20px!important;
+  }
+  ::v-deep.el-radio__label{
+    font-size: 20px!important;
+  }
+  ::v-deep.el-radio__inner{
+    width: 20px!important;
+    height: 20px!important;
+  }
   .footer{
     float: right;
     padding-bottom: 20px;

ruoyi-ui/src/views/login.vue

@@ -55,9 +55,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
-    </div>
+<!--    <div class="el-login-footer">-->
+<!--      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>-->
+<!--    </div>-->
   </div>
 </template>
 

ruoyi-ui/src/views/system/fcry/index.vue

@@ -189,9 +189,6 @@
           v-hasPermi="['system:fcry:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <span style="font-size: 20px;color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/system/fkqk/index.vue

@@ -121,9 +121,6 @@
           v-hasPermi="['system:fkqk:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <span style="font-size: 20px;color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/system/gldry/index.vue

@@ -187,9 +187,6 @@
           v-hasPermi="['system:gldry:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <span style="font-size: 20px;color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/system/hscj/index.vue

@@ -258,7 +258,6 @@
           v-hasPermi="['system:hscj:export']"
         >导出</el-button>
       </el-col>
-      <span style="color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/system/ycsb/index.vue

@@ -151,7 +151,6 @@
           v-hasPermi="['system:ycsb:export']"
         >导出</el-button>
       </el-col>
-      <span style="color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -252,6 +251,14 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="抗原结果" prop="kyResult">
+              <el-radio-group v-model="form.kyResult">
+                <el-radio :label="'0'">异常</el-radio>
+                <el-radio :label="'1'">正常</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否做核酸" prop="hasAcid">
               <el-radio-group v-model="form.hasAcid">
@@ -260,18 +267,20 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="身份证号码" prop="cardNo">
               <el-input v-model="form.cardNo" placeholder="请输入身份证号码" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
               <el-input v-model="form.phone" placeholder="请输入联系方式" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="居住地所在区" prop="area">
               <el-select style="width: 100%" v-model="form.area" placeholder="请选择居住地所在区" @change="quSelect">
@@ -284,8 +293,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item
               label="街道/镇"
@@ -304,6 +311,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item
               label="居委会"
@@ -322,8 +331,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item
               label="小区/村名称"
@@ -342,31 +349,41 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="楼号" prop="building">
               <el-input v-model="form.building" maxlength="30" show-word-limit placeholder="请输入楼号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="单元号" prop="unit">
               <el-input v-model="form.unit" maxlength="4" show-word-limit placeholder="请输入单元号" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="门牌号" prop="house">
               <el-input v-model="form.house" maxlength="4" show-word-limit placeholder="请输入门牌号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="家庭现住址" prop="address">
               <el-input v-model="form.address" maxlength="80" show-word-limit placeholder="请输入家庭现住址" />
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否已处理" prop="isHandle">
+              <el-radio-group v-model="form.isHandle">
+                <el-radio :label="'0'">已处理</el-radio>
+                <el-radio :label="'1'">未处理</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -949,6 +966,7 @@ export default {
         cardNo: null,
         phone: null,
         address: null,
+        isHandle: '0',
         area: null,
         committee: null,
         street: null,
@@ -957,6 +975,7 @@ export default {
         community: null,
         unit: null,
         hasAcid: null,
+        kyResult: '0',
         status: "0",
         delFlag: null,
         createBy: null,

ruoyi-ui/src/views/system/yxry/index.vue

@@ -216,9 +216,6 @@
           v-hasPermi="['system:yxry:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <span style="color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/system/zlqk/index.vue

@@ -110,9 +110,6 @@
           v-hasPermi="['system:zlqk:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <span style="font-size: 20px;color: red;font-weight: bold">数据权限正在配置，请勿修改数据，仅支持查看！！！</span>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>