Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.3/soc/soc.sql

@@ -285,8 +285,19 @@ INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time,
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (0, '安保履职登记簿', '0', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (1, '教育培训登记簿', '1', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (2, '预案演练登记簿', '2', 'register_book_type', null, 'default', 'N', '0', null, now(), null, now(), null);
-
-
+-- 新增行政级别字典
+delete from sys_dict_type where dict_type='administrative_level';
+delete from sys_dict_data where dict_type='administrative_level';
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark)
+ VALUES ('行政级别', 'administrative_level', '0', null, now(), null, now(), '省市县');
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+ VALUES (1, '省级', '1', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '省级');
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (2, '市级', '2', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '市级');
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (3, '县级', '3', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '县级');
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
+VALUES (4, '无', '4', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '无');
 ALTER TABLE  core_protection MODIFY COLUMN id bigint NOT NULL COMMENT '主键';
 ALTER TABLE  core_protection MODIFY COLUMN create_by varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '创建人';
 ALTER TABLE  core_protection MODIFY COLUMN update_by varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '修改人';
@@ -422,6 +433,7 @@ DROP PROCEDURE IF EXISTS schema_change ??
         ALTER TABLE `core_resumption`
 			ADD COLUMN `times` smallint NULL COMMENT '第几次' AFTER `role_id`;
     END IF;
+
 		-- 履职表增加提交人
 	IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption' AND COLUMN_NAME = 'submitor_id' ) THEN
@@ -429,6 +441,12 @@ DROP PROCEDURE IF EXISTS schema_change ??
 			ADD COLUMN `submitor_id` bigint NULL COMMENT '提交人id' AFTER `submit_time`,
 			ADD COLUMN `submitor_name` varchar(32) NULL COMMENT '提交人姓名' AFTER `submitor_id`;
     END IF;
+		-- 人员补充信息表增加金融安全防范工程专家
+	IF
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_user_information' AND COLUMN_NAME = 'financial_experts' ) THEN
+ALTER TABLE `sys_user_information`
+    ADD COLUMN `financial_experts`varchar(32) NULL COMMENT '金融安全防范工程专家'
+END IF;
 	-- 机构扩展添加字段
     IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'remote_count' ) THEN

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUserInformation.java

@@ -141,7 +141,7 @@ public class SysUserInformation extends BaseEntity {
      */
     private String delFlag;
 
-
+private String financialExperts;
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/controller/MonitorAccessReportController.java

@@ -23,6 +23,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author :LuoWei
@@ -42,7 +43,7 @@ public class MonitorAccessReportController {
             monitoringAccessDTO.setCycle("2");
         }
         AjaxResult ajax = AjaxResult.success();
-        TableDataInfo<MonitoringAccessVO> report = monitorAccessReportService.report(monitoringAccessDTO);
+        List<MonitoringAccessVO> report = monitorAccessReportService.selectAll(monitoringAccessDTO);
         ajax.put(AjaxResult.DATA_TAG,report);
         String title = monitorAccessReportService.getTitle(monitoringAccessDTO);
         ajax.put("title",title);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/mapper/MonitorAccessReportMapper.java

@@ -19,5 +19,5 @@ public interface MonitorAccessReportMapper {
 
     Integer selectNetworkNumberByPath(String orgPath);
 
-    List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO);
+    MonitoringAccessVO selectAll(MonitoringAccessDTO monitoringAccessDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -55,7 +56,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
                 amount = 365;
                 break;
             case "3":
-                amount=30;
+                amount = 30;
                 break;
             default:
                 amount = 7;
@@ -67,6 +68,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
         Date time = cal.getTime();
         monitoringAccessDTO.setStartTime(time);
         monitoringAccessDTO.setEndTime(new Date());
+        //    List<SysOrg> sysOrgs = orgService.selectSysOrgByParentId(resumptionDTO.getOrgId(), SecurityConstants.INNER);
         Page<MonitoringAccessVO> report = monitorAccessReportMapper.report(page, monitoringAccessDTO);
         report.getRecords().forEach(r -> {
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(r.getPath());
@@ -77,13 +79,24 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
 
     @Override
     public List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO) {
-
-        List<MonitoringAccessVO> monitoringAccessVOS = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
-        monitoringAccessVOS.forEach(m -> {
-            Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(m.getPath());
-            m.setNetworkNumber(integer);
+        if (null == monitoringAccessDTO.getOrgId()) {
+            monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
+        }
+        List<SysOrg> sysOrgs = remoteOrgService.selectSysOrgByParentId(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
+        List<MonitoringAccessVO> monitoringAccessVOList = new ArrayList<>();
+        sysOrgs.forEach(s -> {
+            MonitoringAccessVO monitoringAccessVO = new MonitoringAccessVO();
+            Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
+            monitoringAccessDTO.setOrgPath(s.getPath());
+            MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
+            monitoringAccessVO.setNetworkNumber(integer);
+            monitoringAccessVO.setAccessRate(monitoringAccessVO1.getAccessRate());
+            monitoringAccessVO.setOrgName(s.getShortName());
+            monitoringAccessVO.setPlanAccessNumber(monitoringAccessVO1.getPlanAccessNumber());
+            monitoringAccessVO.setRealityAccessNumber(monitoringAccessVO1.getRealityAccessNumber());
+            monitoringAccessVOList.add(monitoringAccessVO);
         });
-        return monitoringAccessVOS;
+        return monitoringAccessVOList;
     }
 
     @Override
@@ -127,7 +140,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
                 timeUnit = "周";
                 break;
             case "3":
-                amount=30;
+                amount = 30;
                 timeUnit = "月";
                 break;
             default:

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -175,10 +175,11 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+            DateRange dateRange = new DateRange(plans.get(0).getStartDate(),plans.get(0).getEndDate());
             if(plans.get(0).getPlanCycle()!=6L){
                 code=CycleCommonEnum.getEnum( Math.toIntExact(plans.get(0).getPlanCycle())+2);
+                dateRange = DateUtils.getStartAndEnd(new Date(), code);
             }
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
             List<PlanTaskBuildVo> tasks = new ArrayList<>();
             for (CoreSafecheckPlan plan : plans) {
                 List<PlanTaskBuildVo> planTask = createPlanTask(plan);
@@ -380,11 +381,11 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+            DateRange dateRange = new DateRange(plan.getStartDate(),plan.getEndDate());
             if(plan.getPlanCycle()!=6L){
                 code=CycleCommonEnum.getEnum( Math.toIntExact(plan.getPlanCycle())+2);
+                dateRange = DateUtils.getStartAndEnd(new Date(), code);
             }
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
-
             //获取当前受检机构当前周期营业中的作息
             List<SysWorkTime> workTimes = getWorkTime(dateRange.getStartTime(), dateRange.getEndTime(), org.getId());
             //配合履职次数为short类型

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -205,12 +205,12 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             baseMapper.updateById(ap);
 
             CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+            DateRange dateRange = new DateRange(ap.getStartDate(),ap.getEndDate());
             if(plan.getPlanCycle()!=6L){
                 code=CycleCommonEnum.getEnum( Math.toIntExact(plan.getPlanCycle())+2);
+                dateRange = DateUtils.getStartAndEnd(new Date(), code);
             }
             //撤回需要删除本周期所有任务
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
-
 
             if (plan.getPlanCycle() == 6L) {
                 coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, ap.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
@@ -224,11 +224,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         baseMapper.updateById(plan);
 
         CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+        DateRange dateRange = new DateRange(plan.getStartDate(),plan.getEndDate());
         if(plan.getPlanCycle()!=6L){
             code=CycleCommonEnum.getEnum( Math.toIntExact(plan.getPlanCycle())+2);
+            dateRange = DateUtils.getStartAndEnd(new Date(), code);
         }
-        //撤回需要删除本周期所有任务
-        DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
         if (plan.getPlanCycle() == 6L) {
             coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
         } else {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/CheckNfcRecord.java

@@ -13,6 +13,12 @@ public class CheckNfcRecord {
     @ApiModelProperty("采集点名称")
     private String collectionAreaName;
 
+    @ApiModelProperty("标签名称")
+    private String nfcName;
+
+    @ApiModelProperty("nfc编号")
+    private String nfcCode;
+
     @ApiModelProperty("执行人")
     private String executor;
 

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/MonitorAccessReportMapper.xml

@@ -34,7 +34,7 @@
         SELECT COUNT(1) FROM sys_org WHERE path LIKE  concat( #{orgPath}, '%') AND type=4 AND deleted=0
     </select>
     <select id="selectAll" resultType="com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO">
-        SELECT
+    <!--    SELECT
         b.short_name AS orgName,
         b.path,
         COUNT( a.id ) AS planAccessNumber,
@@ -59,6 +59,30 @@
             AND a.start_time >= #{startTime} ANDa.end_time &lt;= #{endTime}
         </if>
         GROUP BY
-        b.id
+        b.id-->
+        SELECT
+
+        COUNT( a.id ) AS planAccessNumber,
+        IFNULL(	SUM(
+        IF
+        ( a.`status` = 2, 1, 0 )),0) AS realityAccessNumber,
+        IF(COUNT( a.id )=0 or 	IFNULL(	SUM(
+        IF
+        ( a.`status` = 2, 1, 0 )),0)=0,'0%',IFNULL(CONCAT (ROUND(SUM( IF ( a.`status` = 2, 1, 0 ))/ COUNT( a.id )* 100,2) , '%' ),'0%')) AS accessRate
+        FROM
+        core_monitoring_retrieval_task a
+
+        WHERE
+        a.is_deleted=0
+        <if test="orgPath != null  and orgPath != ''">
+            and     a.org_path like concat( #{orgPath}, '%')
+        </if>
+        <if test="cycle != null  and cycle != ''">
+            AND a.cycle = #{cycle}
+        </if>
+        <if test="startTime != null  and endTime != null">
+            AND a.start_time >= #{startTime} AND a.end_time &lt;= #{endTime}
+        </if>
+
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -757,7 +757,13 @@
         group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.count
     </select>
     <select id="selectNfcRecord" resultType="com.xunmei.core.safetyCheck.vo.CheckNfcRecord">
-        select t.scan_method, n.area_name, n.collection_area_name, t.img, t.submit_time as execute_time
+        select t.scan_method,
+               n.area_name,
+               n.collection_area_name,
+               n.code as nfc_code,
+               n.label_name as nfc_name,
+               t.img,
+               t.submit_time as execute_time
         from core_safety_task_data_nfc t
                  left join sys_nfc_bind n on n.id = t.nfc_id
         where t.task_id = #{taskId}