Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

data-ui/src/api/centerdata_emergency1/log.js

@@ -42,3 +42,10 @@ export function delLog(busLogId) {
     method: 'delete'
   })
 }
+
+export function checkLog(busLogId) {
+  return request({
+    url: '/sooka-sponest-center-data/log/checkLog/' + busLogId,
+    method: 'put'
+  })
+}

data-ui/src/views/data/digitalemergency1/log/index.vue

@@ -120,17 +120,17 @@
       <!--v-hasPermi="['system:log:edit']"-->
       <!--&gt;修改</el-button>-->
       <!--</el-col>-->
-      <!--<el-col :span="1.5">-->
-      <!--<el-button-->
-      <!--type="danger"-->
-      <!--plain-->
-      <!--icon="el-icon-delete"-->
-      <!--size="mini"-->
-      <!--:disabled="multiple"-->
-      <!--@click="handleDelete"-->
-      <!--v-hasPermi="['system:log:remove']"-->
-      <!--&gt;删除</el-button>-->
-      <!--</el-col>-->
+      <el-col :span="1.5">
+        <el-button
+        type="success"
+        plain
+        icon="el-icon-edit"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['system:log:edit']"
+        >审核通过</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -158,11 +158,6 @@
           <dict-tag :options="dict.type.log_source" :value="scope.row.logSource"/>
         </template>
       </el-table-column>
-      <el-table-column label="巡更点名称" align="center" prop="busPatrolstationName">
-
-      </el-table-column>
-
-
       <el-table-column label="记录时间" align="center">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{mi}:{s}') }}</span>
@@ -183,6 +178,12 @@
           <dict-tag :options="dict.type.risk_status" :value="scope.row.riskStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="审核状态" align="center" prop="isCheckStatus">
+        <template slot-scope="scope">
+          <label v-show="scope.row.isCheckStatus == '0'" style="color: #ff0000">待审核</label>
+          <label v-show="scope.row.isCheckStatus == '1'" style="color: #00ff00">已通过</label>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="经度" align="center" prop="longitude" />-->
       <!--<el-table-column label="纬度" align="center" prop="latitude" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -260,7 +261,7 @@
 </template>
 
 <script>
-  import {listLog, getLog, delLog, addLog, updateLog} from "@/api/centerdata_emergency1/log";
+import {listLog, getLog, delLog, addLog, updateLog, checkLog} from "@/api/centerdata_emergency1/log";
 
   export default {
     name: "Log",
@@ -428,13 +429,17 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const busLogIds = row.busLogId || this.ids;
-        this.$modal.confirm('是否确认删除日志编号为"' + busLogIds + '"的数据项？').then(function () {
+        checkLog(busLogIds).then(res=>{
+          this.getList();
+          this.$modal.msgSuccess("审核成功");
+        });
+        /*this.$modal.confirm('是否确认删除日志编号为"' + busLogIds + '"的数据项？').then(function () {
           return delLog(busLogIds);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {
-        });
+        });*/
       },
       /** 导出按钮操作 */
       handleExport() {

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -10,10 +10,7 @@ import com.sooka.sponest.data.emergency.appmin.xunjian.domain.AppZgtzsVO;
 import com.sooka.sponest.data.emergency.appmin.xunjian.service.AppXunjianService;
 import com.sooka.sponest.message.api.RemoteMessageService;
 import com.sooka.sponest.message.api.domain.MessageVo;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -83,12 +80,17 @@ public class AppXunjianController {
     }
 
 
-    @RequestMapping("saveZGTZS")
+    /**
+     * 整改通知书
+     * @param vo
+     * @return
+     */
+    @PostMapping("saveZGTZS")
     public AjaxResult saveZGTZS(@RequestBody AppZgtzsVO vo) {
         return appXunjianService.saveZGTZS(vo);
     }
 
-    @RequestMapping("saveZGTZS")
+    @GetMapping("saveZGTZS")
     public R saveZGTZS(String tel) {
         MessageVo messageVo = new MessageVo();
         messageVo.setPhone(tel);
@@ -98,11 +100,21 @@ public class AppXunjianController {
         return SpringUtils.getBean(RemoteMessageService.class).sendMessage(messageVo);
     }
 
+    /**
+     * 复查通知书
+     * @param vo
+     * @return
+     */
     @RequestMapping("saveFCTZS")
     public AjaxResult saveFCTZS(@RequestBody AppFctzsVO vo) {
         return appXunjianService.saveFCTZS(vo);
     }
 
+    /**
+     * 复查通知详情
+     * @param vo
+     * @return
+     */
     @RequestMapping("getFCTZSdetail")
     public AjaxResult getFCTZSdetail(@RequestBody AppFctzsVO vo) {
         return appXunjianService.getFCTZSdetail(vo);

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/service/impl/AppXunjianServiceImpl.java

@@ -134,6 +134,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
         //是否有限期整改的
         Boolean haveXQZG = false;//限期整改
         Boolean haveLCLG = false;//立查立改
+
         String pictures_local_path = remoteConfigService.remotegetConfigKey("appUrl").getData();
         Date createTime = new Date();
         try {
@@ -170,20 +171,22 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                 List list = (List) map.get(key);
                 List content = (List) list.get(1);
                 ObjectMapper mapper = new ObjectMapper();
-                List<ListDataBO> pojos = mapper.convertValue(content, new TypeReference<List<ListDataBO>>() {
-                });
+                //将一个对象（  content  ）转换为一个指定类型的集合（  List<ListDataBO>  ）
+                List<ListDataBO> pojos = mapper.convertValue(content, new TypeReference<List<ListDataBO>>() {});
 
                 for (int i = 0; i < pojos.size(); i++) {
                     ListDataBO listDataBO = pojos.get(i);
                     //循环插入巡检表
                     TBusInspection tBusInspection = new TBusInspection();
                     String busInspectionId = UUID.fastUUID().toString();
+                    //默认-无需整改
                     tBusInspection.setRiskStatus("risk_status_3");
                     tBusInspection.setIsPass("Y");
                     tBusInspection.setCreateTime(createTime);
 
                     if (listDataBO.getChecked() == false) {
                         tBusLog.setIsRisk("1");
+                        //待整改
                         tBusInspection.setRiskStatus("risk_status_0");
                         tBusInspection.setIsPass("N");
                         tBusInspection.setItemsType(listDataBO.getItemsType());
@@ -194,6 +197,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         tBusTrack.setBusInspectionId(busInspectionId);
                         tBusTrack.setDeptId(sysUser.getSysUser().getDeptId());
                         tBusTrack.setUserId(sysUser.getSysUser().getUserId());
+                        //待整改
                         tBusTrack.setRiskStatus("risk_status_0");
                         tBusTrack.setBusTrackContent(listDataBO.getBusTrackContent());
                         tBusTrack.setCreateTime(createTime);
@@ -201,12 +205,14 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                         //如果是立查立改，就再放一个完成的进度 - 巡检表状态标识为已整改
                         if (listDataBO.getItemsType().equals("items_type_0")) {
                             haveLCLG = true;
+                            //已整改
                             tBusInspection.setRiskStatus("risk_status_2");
                             tBusTrack.setRiskStatus("risk_status_2");
                             tBusTrack.setCreateTime(new Date(new Date().getTime()+1000));
                             tBusTrack.setBusTrackId(UUID.fastUUID().toString());
                             tBusTrackMapper.insertTBusTrack(tBusTrack);
                         } else {
+                            //待整改
                             tBusLog.setRiskStatus("risk_status_0");
                             haveXQZG = true;
                         }
@@ -252,6 +258,7 @@ public class AppXunjianServiceImpl extends BaseServiceImpl implements AppXunjian
                 tBusLog.setRiskStatus("risk_status_2");
             }
 
+            tBusLog.setIsCheckStatus("0");
             tBusLogMapper.insertTBusLog(tBusLog);
 
             //写业务部门表

src/main/java/com/sooka/sponest/data/emergency/controller/TBusLogController.java

@@ -96,4 +96,15 @@ public class TBusLogController extends BaseController
     {
         return toAjax(tBusLogService.deleteTBusLogByBusLogIds(busLogIds));
     }
+
+    /**
+     * 删除日志
+     */
+    @RequiresPermissions("system:log:edit")
+    @Log(title = "日志", businessType = BusinessType.UPDATE)
+    @PutMapping("/checkLog/{busLogIds}")
+    public AjaxResult checkLog(@PathVariable String[] busLogIds)
+    {
+        return toAjax(tBusLogService.checkTBusLogByBusLogIds(busLogIds));
+    }
 }

src/main/java/com/sooka/sponest/data/emergency/domain/TBusLog.java

@@ -16,50 +16,69 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class TBusLog extends BaseBusinessEntity
-{
+public class TBusLog extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 日志ID */
+    /**
+     * 日志ID
+     */
     private String busLogId;
 
-    /** 日志类型 */
+    /**
+     * 日志类型
+     */
     private String busLogType;
 
     @Excel(name = "日志类型")
     private String busLogTypeValue;
 
-    /** 来源 */
+    /**
+     * 来源
+     */
     private String logSource;
     @Excel(name = "来源")
     private String logSourceValue;
 
-    /** 隐患 */
+    /**
+     * 隐患
+     */
     private String isRisk;
     @Excel(name = "隐患")
     private String isRiskValue;
 
-    /** 企业ID */
+    /**
+     * 企业ID
+     */
     private String busEnterpriseId;
 
-    /** 企业名称 */
+    /**
+     * 企业名称
+     */
     @Excel(name = "企业名称")
     private String busEnterpriseName;
 
-    /** 状态 */
+    /**
+     * 状态
+     */
     private String riskStatus;
 
     @Excel(name = "状态")
     private String riskStatusValue;
-    /** 经度 */
+    /**
+     * 经度
+     */
     @Excel(name = "经度")
     private String longitude;
 
-    /** 纬度 */
+    /**
+     * 纬度
+     */
     @Excel(name = "纬度")
     private String latitude;
 
-    /** 巡检人 */
+    /**
+     * 巡检人
+     */
     @Excel(name = "巡检人")
     private String createBy;
 
@@ -75,4 +94,13 @@ public class TBusLog extends BaseBusinessEntity
 
     private String busPatrolstationName;
 
+    /**
+     * 审核状态 0未审核 1已审核
+     */
+    private String isCheckStatus;
+    /**
+     * 审核意见: 备用字段
+     */
+    private String checkDetail;
+
 }

src/main/java/com/sooka/sponest/data/emergency/mapper/TBusLogMapper.java

@@ -63,4 +63,6 @@ public interface TBusLogMapper
      * @return 结果
      */
     public int deleteTBusLogByBusLogIds(String[] busLogIds);
+
+    int checkTBusLogByBusLogIds(String[] busLogIds);
 }

src/main/java/com/sooka/sponest/data/emergency/remoteapi/fallback/center/mobile/RemoteSystemBaseServiceFallbackFactory.java

@@ -33,11 +33,11 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
 
         return new RemoteSystemBaseService() {
 
-            @Override
-            public TableDataInfo selectList()
-            {
-                return null;
-            }
+//            @Override
+//            public TableDataInfo selectList()
+//            {
+//                return null;
+//            }
 
 
             @Override
@@ -53,17 +53,17 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
             }
 
 
-            @Override
-            public AjaxResult getInfoApp(Long noticeId)
-            {
-                return null;
-            }
-
-            @Override
-            public AjaxResult getConfigKey(String configKey)
-            {
-                return null;
-            }
+//            @Override
+//            public AjaxResult getInfoApp(Long noticeId)
+//            {
+//                return null;
+//            }
+//
+//            @Override
+//            public AjaxResult getConfigKey(String configKey)
+//            {
+//                return null;
+//            }
 
             @Override
             public R<SysUser> selectById(@PathVariable("userId") Long userId)
@@ -82,17 +82,17 @@ public class RemoteSystemBaseServiceFallbackFactory implements FallbackFactory<R
                 return null;
             }
 
-            @Override
-            public R<String> selectConfigKey(@PathVariable("configKey") String configKey)
-            {
-                return null;
-            }
-
-            @Override
-            public R<LoginUser> getUserInfo(String username, String source)
-            {
-                return R.fail("获取用户失败:" + throwable.getMessage());
-            }
+//            @Override
+//            public R<String> selectConfigKey(@PathVariable("configKey") String configKey)
+//            {
+//                return null;
+//            }
+
+//            @Override
+//            public R<LoginUser> getUserInfo(String username, String source)
+//            {
+//                return R.fail("获取用户失败:" + throwable.getMessage());
+//            }
 
         };
     }

src/main/java/com/sooka/sponest/data/emergency/service/ITBusLogService.java

@@ -69,4 +69,6 @@ public interface ITBusLogService
      * @return 结果
      */
     public int deleteTBusLogByBusLogId(String busLogId);
+
+    int checkTBusLogByBusLogIds(String[] busLogIds);
 }

src/main/java/com/sooka/sponest/data/emergency/service/impl/TBusLogServiceImpl.java

@@ -108,4 +108,10 @@ public class TBusLogServiceImpl extends BaseServiceImpl implements ITBusLogServi
     {
         return tBusLogMapper.deleteTBusLogByBusLogId(busLogId);
     }
+
+    @Override
+    public int checkTBusLogByBusLogIds(String[] busLogIds)
+    {
+        return tBusLogMapper.checkTBusLogByBusLogIds(busLogIds);
+    }
 }

src/main/resources/mapper/emergency/system/TBusLogMapper.xml

@@ -22,6 +22,8 @@
         <result property="logSourceValue" column="log_source_value"/>
         <result property="isRiskValue" column="is_risk_value"/>
         <result property="riskStatusValue" column="risk_status_value"/>
+        <result property="isCheckStatus" column="is_check_status"/>
+        <result property="checkDetail" column="check_detail"/>
     </resultMap>
 
     <resultMap type="ExportVo" id="TBusLogInResult">
@@ -62,6 +64,8 @@
     <sql id="selectTBusLogVo">
         select bus_log_id,
         bus_log_type,
+        is_check_status,
+        check_detail,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=bus_log_type) bus_log_type_value,
         log_source,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=log_source) log_source_value,
@@ -77,6 +81,8 @@
     <select id="selectTBusLogList" parameterType="TBusLog" resultMap="TBusLogResult">
         select g.bus_log_id,
         g.bus_log_type,
+        g.is_check_status,
+        g.check_detail,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=g.bus_log_type) bus_log_type_value,
         log_source,
         (select dict_label from ${database_system}.sys_dict_data where dict_value=g.log_source) log_source_value,
@@ -126,7 +132,8 @@
             g.bus_log_type,
             ( SELECT dict_label FROM ${database_system}.sys_dict_data WHERE dict_value = g.bus_log_type ) bus_log_type_value,
             (select dept_name from ${database_system}.sys_dept where dept_id=d.parent_id) jd_name,
-            d.dept_name sq_name,
+            g.is_check_status,
+            g.check_detail,d.dept_name sq_name,
             u.nick_name user_name,
             g.is_risk,
             ( CASE g.is_risk WHEN 1 THEN '有' ELSE '无' END ) is_risk_value,
@@ -186,6 +193,8 @@
             <if test="createBy != null">create_by,</if>
             <if test="busPatrolstationId != null">bus_patrolstation_id,</if>
             <if test="busPatrolstationName != null">bus_patrolstation_name,</if>
+            <if test="isCheckStatus != null">is_check_status,</if>
+            <if test="checkDetail != null">check_detail,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="busLogId != null">#{busLogId},</if>
@@ -201,6 +210,8 @@
             <if test="createBy != null">#{createBy},</if>
             <if test="busPatrolstationId != null">#{busPatrolstationId},</if>
             <if test="busPatrolstationName != null">#{busPatrolstationName},</if>
+            <if test="isCheckStatus != null">#{isCheckStatus},</if>
+            <if test="checkDetail != null">#{checkDetail},</if>
         </trim>
     </insert>
 
@@ -218,6 +229,8 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="busPatrolstationId != null">bus_patrolstationId = #{busPatrolstationId},</if>
             <if test="busPatrolstationName != null">bus_patrolstation_name = #{busPatrolstationName},</if>
+            <if test="isCheckStatus != null">is_check_status = #{isCheckStatus},</if>
+            <if test="checkDetail != null">check_detail = #{checkDetail},</if>
         </trim>
         where bus_log_id = #{busLogId}
     </update>
@@ -232,4 +245,11 @@
             #{busLogId}
         </foreach>
     </delete>
+
+    <update id="checkTBusLogByBusLogIds" parameterType="String">
+        update t_bus_log set is_check_status = '1' where bus_log_id in
+        <foreach item="busLogId" collection="array" open="(" separator="," close=")">
+            #{busLogId}
+        </foreach>
+    </update>
 </mapper>