diff --git a/jwtech-admin-page/src/assets/image/bg/bg.png b/jwtech-admin-page/src/assets/image/bg/bg.png deleted file mode 100644 index a23b9802..00000000 Binary files a/jwtech-admin-page/src/assets/image/bg/bg.png and /dev/null differ diff --git a/jwtech-admin-page/src/assets/image/bg/bgbgbg.png b/jwtech-admin-page/src/assets/image/bg/bgbgbg.png deleted file mode 100644 index 3b0a2847..00000000 Binary files a/jwtech-admin-page/src/assets/image/bg/bgbgbg.png and /dev/null differ diff --git a/jwtech-admin/src/main/resources/application-test.yml b/jwtech-admin/src/main/resources/application-test.yml index 129b2916..bcd9dde3 100644 --- a/jwtech-admin/src/main/resources/application-test.yml +++ b/jwtech-admin/src/main/resources/application-test.yml @@ -263,6 +263,7 @@ water: #请求测试环境网关 # url: http://19.25.35.204:31190/data_center/gateway/api url: http://19.25.40.186/ebus/1606128918164250625 +# url: http://210.76.82.26:880/ebus/1606128918164250625 #应用token paasToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzeXN0ZW1JZCI6IjE3MzI3MDMxMTE1NDc0ODIxMTQifQ.4oiD3WBwrxT5z8goAvA9O88vsYVxwaE-8vyQmWl7xbg #应用id @@ -289,6 +290,8 @@ water: businessRole: ${water.url}/services/am-usrc/usrc/open-api/role/page # 用户资源 resourceUrl: ${water.url}/services/am-usrc/usrc/resource/build + # 发送消息 +# messageUrl: ${water.url}/services/am-msgc/msgc/open-api/msg/add usersAppsecret: 97ba97908eca4624aa131f7530cc4d30 usersServiceId: DGSP_1606198353790349313 diff --git a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java index 8f698a67..75ee946c 100644 --- a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java +++ b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java @@ -1019,7 +1019,7 @@ public class evaluateTask { private BsSlgcQqjdContractFulfillingNoticeMapper bsSlgcQqjdContractFulfillingNoticeMapper; //项目信息完整度低于95% - @Scheduled(cron = "0 0/2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void submissionIncompleteProInfo(){ List bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.selectList(null); WarnType warnType=WarnType.SUBMISSION_INCOMPLETE; diff --git a/jwtech-system/pom.xml b/jwtech-system/pom.xml index 17ecef73..2a3b896f 100644 --- a/jwtech-system/pom.xml +++ b/jwtech-system/pom.xml @@ -55,13 +55,13 @@ 0.0.1-SNAPSHOT - - com.sun - tools - 1.6.0 - system - D:/zth/jdk8/lib/tools.jar - + + + + + + + diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiHazardRecordController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiHazardRecordController.java index eeea36b4..c8bb6ad7 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiHazardRecordController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiHazardRecordController.java @@ -112,4 +112,17 @@ public class BsSgcJsjdBuiHazardRecordController extends BaseController { return toAjax(bsSgcJsjdBuiHazardRecordService.removeByIds(Arrays.asList(ids))); } + + + /** + * 照片库管理 + */ + @Log(title = "照片库管理列表", businessType = BusinessType.INSERT) + @PostMapping("/getPhotoManagement") + @ApiOperation("照片库管理列表") + public AjaxResult getPhotoManagement(@RequestBody SearchParam sp) + { + return AjaxResult.success(bsSgcJsjdBuiHazardRecordService.getPhotoManagement(sp)); + } + } diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java index fbd68db6..012f18cb 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java @@ -173,4 +173,13 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController { return toAjax(bsSgcJsjdBuiProgressInfoService.removeByIds(Arrays.asList(ids))); } + + @ApiOperation("进度填报工作效益统计") + @Log(title = "进度填报工作效益统计", businessType = BusinessType.DELETE) + @GetMapping("/workEfficiencyStatistics/{proNo}") + public AjaxResult workEfficiencyStatistics(@PathVariable String proNo) + { + return AjaxResult.success(bsSgcJsjdBuiProgressInfoService.workEfficiencyStatistics(proNo)); + } + } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java index 9799659a..60395a52 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java @@ -93,4 +93,12 @@ public class BsSgcJsjdBuiProgressInfo extends BaseEntity @TableField(exist = false) private String nickName; + @Excel(name = "完成工作量") + @ApiModelProperty("完成工作量") + private BigDecimal completeWorkload; + + @Excel(name = "投资效益") + @ApiModelProperty("投资效益") + private BigDecimal investmentBenefits; + } diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiHazardRecordMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiHazardRecordMapper.java index fa4249be..9c7e615b 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiHazardRecordMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiHazardRecordMapper.java @@ -1,8 +1,15 @@ package com.kms.build.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.build.domain.BsSgcJsjdBuiHazardRecord; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; /** @@ -14,4 +21,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Repository public interface BsSgcJsjdBuiHazardRecordMapper extends BaseMapper { + IPage getPhotoManagement(Page page, BsSgcJsjdBuiHazardRecord data); + } diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java index 8b892246..fbc951b1 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java @@ -1,9 +1,14 @@ package com.kms.build.mapper; import com.kms.build.domain.BsSgcJsjdBuiProgressInfo; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; +import java.util.List; + /** * 【请填写功能名称】Mapper接口 @@ -14,4 +19,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Repository public interface BsSgcJsjdBuiProgressInfoMapper extends BaseMapper { + @Select("SELECT \n" + + " EXTRACT(YEAR FROM stage_time) AS year,\n" + + " SUM(complete_workload) AS completeWorkload,\n" + + " SUM(investment_benefits) AS investmentBenefits\n" + + "FROM \n" + + " bs_sgc_jsjd_bui_progress_info\n" + + " \n" + + " WHERE PRO_NO = #{proNo}\n" + + "GROUP BY \n" + + " EXTRACT(YEAR FROM stage_time)\n" + + "ORDER BY \n" + + " year;") + List workEfficiencyStatistics(@Param("proNo") String proNo); } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiHazardRecordService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiHazardRecordService.java index 61b39c5a..b40a68c5 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiHazardRecordService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiHazardRecordService.java @@ -1,10 +1,26 @@ package com.kms.build.service; +import cn.hutool.json.JSONObject; +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jianwei.common.core.domain.SearchParam; import com.kms.build.domain.BsSgcJsjdBuiHazardRecord; +import com.kms.build.domain.BsSgcJsjdBuiSectionInfo; +import com.kms.build.domain.BsSgcjsjdBuiProInfo; import com.kms.build.mapper.BsSgcJsjdBuiHazardRecordMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; +import java.sql.Wrapper; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + /** * 隐患记录登记信息Service接口 @@ -15,4 +31,13 @@ import com.jianwei.common.core.service.BaseService; @Service public class BsSgcJsjdBuiHazardRecordService extends BaseService{ + + @Autowired + BsSgcJsjdBuiHazardRecordMapper bsSgcJsjdBuiHazardRecordMapper; + + + public IPage getPhotoManagement(SearchParam sp) { + Page page=new Page<>(sp.getPageNum(),sp.getPageSize()); + return bsSgcJsjdBuiHazardRecordMapper.getPhotoManagement(page,sp.getData()); + } } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java index 8afd3db4..e34610b7 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java @@ -2,9 +2,13 @@ package com.kms.build.service; import com.kms.build.domain.BsSgcJsjdBuiProgressInfo; import com.kms.build.mapper.BsSgcJsjdBuiProgressInfoMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; +import java.util.HashMap; +import java.util.List; + /** * 【请填写功能名称】Service接口 * @@ -14,4 +18,11 @@ import com.jianwei.common.core.service.BaseService; @Service public class BsSgcJsjdBuiProgressInfoService extends BaseService{ + + @Autowired + BsSgcJsjdBuiProgressInfoMapper bsSgcJsjdBuiProgressInfoMapper; + + public List workEfficiencyStatistics(String proNo) { + return bsSgcJsjdBuiProgressInfoMapper.workEfficiencyStatistics(proNo); + } } diff --git a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcBasicDeviceInformationController.java b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcBasicDeviceInformationController.java index bcdd4477..3cfe6360 100644 --- a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcBasicDeviceInformationController.java +++ b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcBasicDeviceInformationController.java @@ -111,4 +111,15 @@ public class BsSgcBasicDeviceInformationController extends BaseController { return toAjax(bsSgcBasicDeviceInformationService.removeByIds(Arrays.asList(ids))); } + + + /** + * 超重设备统计 + */ + @ApiOperation("超重设备统计") + @GetMapping(value = "/statisticsOfOverweightEquipment/{proNo}") + public AjaxResult statisticsOfOverweightEquipment(@PathVariable("proNo") String proNo) + { + return AjaxResult.success(bsSgcBasicDeviceInformationService.statisticsOfOverweightEquipment(proNo)); + } } diff --git a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcProjectAttendanceDetailsController.java b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcProjectAttendanceDetailsController.java index 0ae88c38..0081bd7d 100644 --- a/jwtech-system/src/main/java/com/kms/site/controller/BsSgcProjectAttendanceDetailsController.java +++ b/jwtech-system/src/main/java/com/kms/site/controller/BsSgcProjectAttendanceDetailsController.java @@ -111,4 +111,13 @@ public class BsSgcProjectAttendanceDetailsController extends BaseController { return toAjax(bsSgcProjectAttendanceDetailsService.removeByIds(Arrays.asList(ids))); } + + @ApiOperation("人员考勤统计") + @Log(title = "人员考勤统计", businessType = BusinessType.SEARCH) + @GetMapping("/personnelAttendanceStatistics/{proNo}") + public AjaxResult personnelAttendanceStatistics(@PathVariable String proNo) + { + return AjaxResult.success(bsSgcProjectAttendanceDetailsService.personnelAttendanceStatistics(proNo)); + } + } diff --git a/jwtech-system/src/main/java/com/kms/site/domain/BsSgcBasicDeviceInformation.java b/jwtech-system/src/main/java/com/kms/site/domain/BsSgcBasicDeviceInformation.java index 9dc7f33e..f8a0f6c2 100644 --- a/jwtech-system/src/main/java/com/kms/site/domain/BsSgcBasicDeviceInformation.java +++ b/jwtech-system/src/main/java/com/kms/site/domain/BsSgcBasicDeviceInformation.java @@ -75,4 +75,6 @@ public class BsSgcBasicDeviceInformation extends BaseEntity @ApiModelProperty("检查合格日期") private String updateUid; + @ApiModelProperty("是否超重") + private String isOverweight; } diff --git a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcBasicDeviceInformationMapper.java b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcBasicDeviceInformationMapper.java index 3cedf9fd..f8b7629e 100644 --- a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcBasicDeviceInformationMapper.java +++ b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcBasicDeviceInformationMapper.java @@ -1,9 +1,14 @@ package com.kms.site.mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.site.domain.BsSgcBasicDeviceInformation; +import java.util.HashMap; +import java.util.List; + /** * 设备基本信息Mapper接口 * @@ -13,4 +18,8 @@ import com.kms.site.domain.BsSgcBasicDeviceInformation; @Repository public interface BsSgcBasicDeviceInformationMapper extends BaseMapper { + @Select("SELECT model,count(*) total,\n" + + "SUM(CASE WHEN is_overweight = '0' THEN 1 ELSE 0 END) AS non_overweight_count\n" + + " from bs_sgc_basic_device_information where pro_no = #{proNo} GROUP BY model") + List statisticsOfOverweightEquipment(@Param("proNo") String proNo); } diff --git a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcProjectAttendanceDetailsMapper.java b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcProjectAttendanceDetailsMapper.java index 325c8720..fb49186c 100644 --- a/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcProjectAttendanceDetailsMapper.java +++ b/jwtech-system/src/main/java/com/kms/site/mapper/BsSgcProjectAttendanceDetailsMapper.java @@ -1,9 +1,14 @@ package com.kms.site.mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.site.domain.BsSgcProjectAttendanceDetails; +import java.util.HashMap; +import java.util.List; + /** * 人员出勤明细Mapper接口 * @@ -13,4 +18,18 @@ import com.kms.site.domain.BsSgcProjectAttendanceDetails; @Repository public interface BsSgcProjectAttendanceDetailsMapper extends BaseMapper { + @Select("SELECT *,IF(totle - workCount >= 0, totle - workCount, 0) as noWorkCount FROM (\n" + + "SELECT \n" + + " DATE(attendance_time) as dte,\n" + + " COUNT(*) as workCount,\n" + + " (select count(*) from bs_sgc_project_personnel WHERE pro_no = #{proNo}) as totle\n" + + " FROM \n" + + " bs_sgc_project_attendance_details\n" + + " WHERE pro_no = #{proNo}\n" + + "GROUP BY \n" + + " DATE(attendance_time)\n" + + " \n" + + "ORDER BY dte asc\n" + + ") as dome") + List personnelAttendanceStatistics(@Param("proNo") String proNo); } diff --git a/jwtech-system/src/main/java/com/kms/site/service/BsSgcBasicDeviceInformationService.java b/jwtech-system/src/main/java/com/kms/site/service/BsSgcBasicDeviceInformationService.java index c455ac87..0cebe7dd 100644 --- a/jwtech-system/src/main/java/com/kms/site/service/BsSgcBasicDeviceInformationService.java +++ b/jwtech-system/src/main/java/com/kms/site/service/BsSgcBasicDeviceInformationService.java @@ -1,10 +1,15 @@ package com.kms.site.service; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.site.mapper.BsSgcBasicDeviceInformationMapper; import com.kms.site.domain.BsSgcBasicDeviceInformation; +import java.util.HashMap; +import java.util.List; +import java.util.logging.Handler; + /** * 设备基本信息Service接口 * @@ -14,4 +19,11 @@ import com.kms.site.domain.BsSgcBasicDeviceInformation; @Service public class BsSgcBasicDeviceInformationService extends BaseService{ + @Autowired + BsSgcBasicDeviceInformationMapper bsSgcBasicDeviceInformationMapper; + + + public List statisticsOfOverweightEquipment(String proNo) { + return bsSgcBasicDeviceInformationMapper.statisticsOfOverweightEquipment(proNo); + } } diff --git a/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectAttendanceDetailsService.java b/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectAttendanceDetailsService.java index 54132a86..c6461711 100644 --- a/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectAttendanceDetailsService.java +++ b/jwtech-system/src/main/java/com/kms/site/service/BsSgcProjectAttendanceDetailsService.java @@ -1,10 +1,14 @@ package com.kms.site.service; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.site.mapper.BsSgcProjectAttendanceDetailsMapper; import com.kms.site.domain.BsSgcProjectAttendanceDetails; +import java.util.HashMap; +import java.util.List; + /** * 人员出勤明细Service接口 * @@ -14,4 +18,15 @@ import com.kms.site.domain.BsSgcProjectAttendanceDetails; @Service public class BsSgcProjectAttendanceDetailsService extends BaseService{ + @Autowired + private BsSgcProjectPersonnelService bsSgcProjectPersonnelService; + + @Autowired + BsSgcProjectAttendanceDetailsMapper bsSgcProjectAttendanceDetailsMapper; + + public List personnelAttendanceStatistics(String proNo) { + List list = bsSgcProjectAttendanceDetailsMapper.personnelAttendanceStatistics(proNo); + return list; + } + } diff --git a/jwtech-system/src/main/java/com/kms/warn/WarnOperate.java b/jwtech-system/src/main/java/com/kms/warn/WarnOperate.java index 8295ab82..7670c4ad 100644 --- a/jwtech-system/src/main/java/com/kms/warn/WarnOperate.java +++ b/jwtech-system/src/main/java/com/kms/warn/WarnOperate.java @@ -99,6 +99,7 @@ public class WarnOperate { one.setWarnResult(warnResult); bsSgcJsjdWarnResultService.updateById(one); } + waterRequestUtil.sendMessage("inMail","一条预警提醒","",""); } /**