diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java index 2999d1769..aecb901c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.car.controller; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.car.entity.CarPassRecord; @@ -153,6 +154,8 @@ public class CarPassRecordController { log.info(JSONUtil.toJsonStr(data)); } else if ("offline".equals(type)) { Map resultMap = carPassRecordService.saveCameraCarPassRecord(plate_num, car_logo, car_color, park_id, cam_id, vdc_type, picture, closeup_pic); + data.put("error_num", 0); + data.put("error_str", "not error"); } else if ("heartbeat".equals(type)) { //log.info("车牌心跳" + "车场ID：" + park_id + "相机ID：" + cam_id); Map resultMap = new HashMap<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml index 8bd2a46d0..3d053d748 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/HiddenDangerInspectRecordMapper.xml @@ -376,7 +376,7 @@ IFNULL(SUM((IF(status = 1 or status = 4, 1, 0))), 0) allRectificationNum, IFNULL(SUM((IF(!(status = 1 or status = 4) or status is null, 1, 0))), 0) allNoRectificationNum, - IFNULL(SUM((IF(YEARWEEK(inspect_time, 1) = YEARWEEK(now(), 7), 1, 0))), + IFNULL(SUM((IF(YEARWEEK(inspect_time, 1) = YEARWEEK(now(), 1), 1, 0))), 0) weekTotalNum from hidden_danger_inspection_record WHERE project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index f77ca3046..d5fe994b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -4,6 +4,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; +import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; @@ -94,6 +95,20 @@ public class QualityInspectionRecordController { return Result.success(qualityInspectionRecordService.getQualityAcceptanceAndRectificationNum(projectSn)); } + /** + * 获取质量巡检本周和所有数据 + * + * @return + */ + @ApiOperation(value = "获取质量巡检本周和所有数据") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") + }) + @GetMapping(value = "/getQualityAcceptanceAndRectificationNumThisWeek") + public Result getQualityAcceptanceAndRectificationNumThisWeek(String projectSn) { + return Result.success(qualityInspectionRecordService.getQualityAcceptanceAndRectificationNumThisWeek(projectSn)); + } + /** * 根据分部分项获取对应质量巡检 * diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndThisWeekDataVO.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndThisWeekDataVO.java new file mode 100644 index 000000000..beaa67fe2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndThisWeekDataVO.java @@ -0,0 +1,31 @@ +package com.zhgd.xmgl.modules.quality.entity.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + + +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "AllAndWeekDataVO对象", description = "质量巡检本周和所有数据") +@NoArgsConstructor +@AllArgsConstructor +public class AllAndThisWeekDataVO extends AllDataVO { + @ApiModelProperty(value = "本周巡检总数") + private Long weekTotal; + + @ApiModelProperty(value = "本周已闭合") + private Long weekClose; + + @ApiModelProperty(value = "本周未闭合") + private Long weekNoClose; + + @ApiModelProperty(value = "本周已闭合占比") + private Double weekCloseRatio; + + @ApiModelProperty(value = "本周未闭合占比") + private Double weekNoCloseRatio; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndWeekDataVO.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndWeekDataVO.java index b64eb584e..5aee31f12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndWeekDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/AllAndWeekDataVO.java @@ -21,4 +21,16 @@ import lombok.NoArgsConstructor; public class AllAndWeekDataVO extends AllDataVO { @ApiModelProperty(value = "本周巡检总数") private Long weekTotal; + + @ApiModelProperty(value = "本周已闭合") + private Long weekClose; + + @ApiModelProperty(value = "本周未闭合") + private Long weekNoClose; + + @ApiModelProperty(value = "本周已闭合占比") + private Double weekCloseRatio; + + @ApiModelProperty(value = "本周未闭合占比") + private Double weekNoCloseRatio; } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java index c7fd3c6dc..e92d20b7a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; +import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; import org.apache.ibatis.annotations.Mapper; @@ -40,4 +41,6 @@ public interface QualityInspectionRecordMapper extends BaseMapper + diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java index a00f58d55..b3380f974 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityInspectionRecordService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.quality.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; +import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; @@ -38,6 +39,8 @@ public interface IQualityInspectionRecordService extends IService limitListBySubdivision(String projectSn, Long subsectionId, Long subentryId, Integer size); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java index 49f0892cd..a47e1af12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.QualityRectifyRecord; +import com.zhgd.xmgl.modules.quality.entity.vo.AllAndThisWeekDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndTodayDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllAndWeekDataVO; import com.zhgd.xmgl.modules.quality.entity.vo.AllDataVO; @@ -203,10 +204,19 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl(1, size), wrapper).getRecords(); } + private void setWeekRatioData(AllAndWeekDataVO allAndWeekDataVO) { + long weekClose = allAndWeekDataVO.getWeekClose(); + long weekNoClose = allAndWeekDataVO.getWeekNoClose(); + long l = weekClose + weekNoClose; + allAndWeekDataVO.setWeekCloseRatio(l != 0 ? NumberUtil.div(NumberUtil.mul(weekClose, 100), l, 2) : 0); + allAndWeekDataVO.setWeekNoCloseRatio(l != 0 ? NumberUtil.div(NumberUtil.mul(weekNoClose, 100), l, 2) : 0); + allAndWeekDataVO.setWeekTotal(l); + } + + private void setWeekRatio(AllAndThisWeekDataVO allAndThisWeekDataVO) { + long weekClose = allAndThisWeekDataVO.getWeekClose(); + long weekNoClose = allAndThisWeekDataVO.getWeekNoClose(); + long l = weekClose + weekNoClose; + allAndThisWeekDataVO.setWeekCloseRatio(l != 0 ? NumberUtil.div(NumberUtil.mul(weekClose, 100), l, 2) : 0); + allAndThisWeekDataVO.setWeekNoCloseRatio(l != 0 ? NumberUtil.div(NumberUtil.mul(weekNoClose, 100), l, 2) : 0); + allAndThisWeekDataVO.setWeekTotal(l); + } + private void setTodayRatio(AllAndTodayDataVO allAndTodayDataVO) { long todayClose = allAndTodayDataVO.getTodayClose(); long todayNoClose = allAndTodayDataVO.getTodayNoClose(); diff --git a/src/main/java/com/zhgd/xmgl/modules/security/controller/SecurityManageController.java b/src/main/java/com/zhgd/xmgl/modules/security/controller/SecurityManageController.java index 5b8a8b256..87529f93d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/security/controller/SecurityManageController.java +++ b/src/main/java/com/zhgd/xmgl/modules/security/controller/SecurityManageController.java @@ -163,7 +163,7 @@ public class SecurityManageController { return Result.success(securityManageService.selectRectifiedSecurityManageList(map)); } - @ApiOperation(value = "查询最新20条待整改的安全管理数据", notes = "查询最新一条待整改的安全管理数据" , httpMethod="POST") + @ApiOperation(value = "查询待整改的安全管理数据", httpMethod="POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"), }) diff --git a/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml index 9d1e01924..f57159852 100644 --- a/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/security/mapper/xml/SecurityManageMapper.xml @@ -74,7 +74,6 @@ where a.project_sn=#{projectSn} and a.state=1 order by a.create_time desc - LIMIT 20 \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml index 742243ebd..b2b7e2782 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/DepartmentInfoMapper.xml @@ -7,6 +7,9 @@ from department_info a LEFT JOIN (SELECT department_id,COUNT(1) worker_num FROM worker_info WHERE project_sn=#{projectSn} + + and person_type = #{personType} + GROUP BY department_id ) b ON a.id=b.department_id WHERE a.project_sn=#{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/util/JxjNewUfaceDevUtil.java b/src/main/java/com/zhgd/xmgl/util/JxjNewUfaceDevUtil.java index 0d234660c..8187be690 100644 --- a/src/main/java/com/zhgd/xmgl/util/JxjNewUfaceDevUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/JxjNewUfaceDevUtil.java @@ -39,29 +39,37 @@ public class JxjNewUfaceDevUtil { } public static void addOrUpdatePerson(WorkerInfo workerInfo, ProjectUfaceConfig projectUfaceConfig,String basePath,String deviceKeys,Integer jxjDevImageType) { - JSONObject jsonObject=new JSONObject(); - jsonObject.put("personName",workerInfo.getWorkerName()); - jsonObject.put("projectId",projectUfaceConfig.getAppId()); - jsonObject.put("personSn",workerInfo.getPersonSn()); - if(StringUtils.isNotEmpty(workerInfo.getFieldAcquisitionUrl())&&workerInfo.getFieldAcquisitionUrl().startsWith("http")){ - if(jxjDevImageType==2){ - jsonObject.put("image",workerInfo.getFieldAcquisitionUrl()); - }else{ - jsonObject.put("image",Base64Util.getFileToBase64(workerInfo.getFieldAcquisitionUrl())); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("personName", workerInfo.getWorkerName()); + jsonObject.put("projectId", projectUfaceConfig.getAppId()); + jsonObject.put("personSn", workerInfo.getPersonSn()); + if (StringUtils.isNotEmpty(workerInfo.getFieldAcquisitionUrl()) && workerInfo.getFieldAcquisitionUrl().startsWith("http")) { + if (jxjDevImageType == 2) { + jsonObject.put("image", workerInfo.getFieldAcquisitionUrl()); + } else { + jsonObject.put("image", Base64Util.getFileToBase64(workerInfo.getFieldAcquisitionUrl())); } - }else{ - if(jxjDevImageType==2){ - jsonObject.put("image",workerInfo.getFieldAcquisitionUrl()); - }else{ - jsonObject.put("image",Base64Util.getFileToBase64(basePath+"/"+workerInfo.getFieldAcquisitionUrl())); + } else { + if (jxjDevImageType == 2) { + jsonObject.put("image", workerInfo.getFieldAcquisitionUrl()); + } else { + jsonObject.put("image", Base64Util.getFileToBase64(basePath + "/" + workerInfo.getFieldAcquisitionUrl())); } } - jsonObject.put("idNum",workerInfo.getIdCard()); - jsonObject.put("cardNum",workerInfo.getAttendanceNumber()); - jsonObject.put("deviceKeys",deviceKeys); - String result=HttpUtil.post(projectUfaceConfig.getServiceUrl()+"/api/person/addOrUpdatePerson",jsonObject.toString()); - log.info("-----新JXJ设备添加或编辑人员结果："+result); + jsonObject.put("idNum", workerInfo.getIdCard()); + jsonObject.put("cardNum", workerInfo.getAttendanceNumber()); + jsonObject.put("deviceKeys", deviceKeys); + String url = projectUfaceConfig.getServiceUrl() + "/api/person/addOrUpdatePerson"; + String body = jsonObject.toString(); + log.info("url：{}，body：{}", url, body); + String result = null; + try { + result = HttpUtil.post(url, body); + } catch (Exception e) { + log.error("err：", e); + } + log.info("-----新JXJ设备添加或编辑人员结果：" + result); } public static void deleteWorkerInfo(WorkerInfo workerInfo, ProjectUfaceConfig projectUfaceConfig) {