From f5c7dcefceaa56584a8a1cc5285f5f36328a1f53 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 28 Mar 2023 18:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/api/image_ai/ImageApi.java | 6 ++--- .../basicdata/api/image_ai/Opencv.java | 2 +- .../admin/AppVersionController.java | 8 +++++-- .../admin/BaseModuleController.java | 2 +- .../admin/SystemUserController.java | 19 +++++++++++----- .../project/EngineeringController.java | 10 +++++++-- .../project/EnterpriseController.java | 17 +++++++------- .../modules/basicdata/entity/Engineering.java | 22 +++++++++++++++++-- .../basicdata/entity/EngineeringMain.java | 12 ++++++++++ .../mapper/EnterpriseMainMapper.java | 2 +- .../basicdata/mapper/EnterpriseMapper.java | 2 +- .../mapper/xml/EnterpriseMainMapper.xml | 6 ++--- .../basicdata/mapper/xml/EnterpriseMapper.xml | 2 +- .../basicdata/service/IEnterpriseService.java | 2 +- .../basicdata/service/IGovernmentService.java | 3 +++ .../service/impl/BaseModuleServiceImpl.java | 6 +++-- .../impl/EnterpriseMainServiceImpl.java | 6 ++--- .../service/impl/EnterpriseServiceImpl.java | 12 ++++++++-- .../service/impl/GovernmentServiceImpl.java | 17 ++++++++++++++ .../java/com/zhgd/xmgl/task/ImageAiTask.java | 8 +++++-- 20 files changed, 123 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/ImageApi.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/ImageApi.java index 915120c..5aa1ce2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/ImageApi.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/ImageApi.java @@ -2,7 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.api.image_ai; import com.alibaba.fastjson.JSONArray; import com.zhgd.xmgl.modules.basicdata.api.image_ai.common.FireSmokeDetectExample; -import com.zhgd.xmgl.modules.basicdata.api.image_ai.common.LargeSafetyHelmetDetectExample; +import com.zhgd.xmgl.modules.basicdata.api.image_ai.common.MediumSafetyHelmetDetectExample; import com.zhgd.xmgl.modules.basicdata.api.image_ai.common.ReflectiveVestDetectExample; import com.zhgd.xmgl.modules.basicdata.api.image_ai.utils.AiBroker; import lombok.experimental.UtilityClass; @@ -16,7 +16,7 @@ public class ImageApi { */ public JSONArray safetyHelmet(String rtsp) { String result = AiBroker.runAs(rtsp, imagePath -> { - return LargeSafetyHelmetDetectExample.imageAi(imagePath); + return MediumSafetyHelmetDetectExample.imageAi(imagePath); }); return JSONArray.parseArray(result); } @@ -45,7 +45,7 @@ public class ImageApi { public static void main(String[] argstia) { try { - System.out.println(safetyHelmet("rtsp://admin:jxj12345@10.0.77.104:554/Streaming/Channels/101")); + System.out.println(fireSmoke("rtsp://admin:jxj12345@10.0.77.104:554/Streaming/Channels/101")); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/Opencv.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/Opencv.java index cad8212..bb897bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/Opencv.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/api/image_ai/Opencv.java @@ -79,7 +79,7 @@ public class Opencv { mat.release(); cvmat.release(); log.info("==========opencv success============="); - return filePath + fileUrl + ".jpg"; + return fileUrl; } catch (Exception e) { log.info("==========opencv fail============="); throw new RuntimeException(e); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java index 83be4ed..987bd09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/AppVersionController.java @@ -1,9 +1,11 @@ package com.zhgd.xmgl.modules.basicdata.controller.admin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; import com.zhgd.xmgl.modules.basicdata.entity.AppVersion; import com.zhgd.xmgl.modules.basicdata.service.IAppVersionService; @@ -44,12 +46,14 @@ public class AppVersionController { @ApiOperation(value = " 分页列表查询APP版本表信息", notes = "分页列表查询APP版本表信息", httpMethod="POST") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer") + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer"), + @ApiImplicitParam(name = "versionName", value = "版本名称", paramType = "query", dataType = "String") }) @PostMapping(value = "/page") public Result> queryPageList(@RequestBody Map map) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(AppVersion.class, map); Page page = PageUtil.getPage(map); - return Result.success(appVersionService.page(page, null)); + return Result.success(appVersionService.page(page, queryWrapper)); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java index bf172f3..aa84738 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/BaseModuleController.java @@ -62,6 +62,7 @@ public class BaseModuleController { public Result> queryPageList(@RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(BaseModule.class, map); Page page = PageUtil.getPage(map); + queryWrapper.orderByAsc("label_sort_num", "priority"); IPage pageList = baseModuleService.pageList(page, queryWrapper); return Result.success(pageList); } @@ -76,7 +77,6 @@ public class BaseModuleController { public Result> queryListByType(@RequestBody BaseModule baseModule, HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(baseModule, req.getParameterMap()); - queryWrapper.orderByDesc("is_important_module"); queryWrapper.orderByAsc("label_sort_num", "priority"); List list = baseModuleService.list(queryWrapper); Map map = new HashMap<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserController.java index b266857..dc3d29b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserController.java @@ -9,7 +9,9 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.basicdata.dto.SystemUserDto; +import com.zhgd.xmgl.modules.basicdata.entity.Government; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.IGovernmentService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.basicdata.vo.SystemUserVo; import com.zhgd.xmgl.security.JwtTokenProvider; @@ -56,6 +58,9 @@ import java.util.Map; public class SystemUserController { @Autowired private ISystemUserService systemUserService; + + @Autowired + private IGovernmentService governmentService; @Autowired private JwtTokenProvider jwtTokenProvider; @@ -324,12 +329,16 @@ public class SystemUserController { result.error500("登录名或密码错误"); } else if(userInfo.getState() == 0) { result.error500("账号已被禁用,请联系管理员"); - } else { - String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24); - userInfo.setToken(token); - result.setResult(userInfo); - result.setSuccess(true); + } else if(userInfo.getAccountType() != 1) { + Government government = governmentService.getGovByUser(userInfo); + if (government == null || government.getState() == 0) { + result.error500("住建局账号异常,请联系管理员"); + } } + String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24); + userInfo.setToken(token); + result.setResult(userInfo); + result.setSuccess(true); return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java index 0291168..a0a2f96 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java @@ -66,8 +66,14 @@ public class EngineeringController { @PostMapping(value = "/add") public Result add(@RequestBody EngineeringVo engineeringVo) { Result result = new Result(); - engineeringService.saveInfo(engineeringVo); - result.success("添加成功！"); + Engineering engineering = engineeringService.getOne(Wrappers.lambdaQuery() + .eq(Engineering::getEngineeringName, engineeringVo.getEngineeringName())); + if (engineering != null) { + result.error500("该工程名已被占用"); + } else { + engineeringService.saveInfo(engineeringVo); + result.success("添加成功！"); + } return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnterpriseController.java index 3c5a361..4882e59 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EnterpriseController.java @@ -3,10 +3,10 @@ package com.zhgd.xmgl.modules.basicdata.controller.project; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.basicdata.entity.Enterprise; -import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMain; import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; /** @@ -40,13 +41,13 @@ public class EnterpriseController { */ @OperLog(operModul = "企业管理", operType = "列表查询", operDesc = "列表查询相对应资质的企业") @ApiOperation(value = "列表查询相对应资质的企业", notes = "列表查询相对应资质的企业", httpMethod = "POST") - @ApiImplicitParam(name = "mainType", value = "企业主体类型(1:建设;2:监理;3:施工;4:勘察;5:设计;)", paramType = "query", required = true, dataType = "Integer") + @ApiImplicitParams({ + @ApiImplicitParam(name = "mainType", value = "企业主体类型(1:建设;2:监理;3:施工;4:勘察;5:设计;)", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "enterpriseName", value = "企业名称", paramType = "query", required = true, dataType = "String") + }) @PostMapping(value = "/listByMainType") - public Result> listByMainType(@RequestBody EnterpriseMain enterpriseMain) { - Result> result = new Result>(); - List enterpriseList = enterpriseService.listByMainType(enterpriseMain.getMainType()); - result.setResult(enterpriseList); - result.setSuccess(true); - return result; + public Result> listByMainType(@RequestBody Map map) { + List enterpriseList = enterpriseService.listByMainType(map); + return Result.success(enterpriseList); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java index 388c131..60a62b6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -168,6 +170,12 @@ public class Engineering implements Serializable { @Excel(name = "安全监督编号", width = 15) @ApiModelProperty(value = "安全监督编号") private String safetySupervisionCode; + /** + * 安全监督员 + */ + @Excel(name = "安全监督员", width = 15) + @ApiModelProperty(value = "安全监督员") + private String safetySupervisionPerson; /** * 安全监督工程状态 */ @@ -192,6 +200,12 @@ public class Engineering implements Serializable { @Excel(name = "质量监督编码", width = 15) @ApiModelProperty(value = "质量监督编码") private String qualitySupervisionCode; + /** + * 质量监督员 + */ + @Excel(name = "质量监督员", width = 15) + @ApiModelProperty(value = "质量监督员") + private String qualitySupervisionPerson; /** * 质量监督工程状态 */ @@ -207,13 +221,17 @@ public class Engineering implements Serializable { /** * 合同开工日期 */ - @Excel(name = "合同开工日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "合同开工日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "合同开工日期") private Date startTime; /** * 合同竣工日期 */ - @Excel(name = "合同竣工日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "合同竣工日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "合同竣工日期") private Date endTime; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java index ddf6ab5..af7fb63 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMain.java @@ -56,4 +56,16 @@ public class EngineeringMain implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "企业名称") private String enterpriseName; + + @TableField(exist = false) + @ApiModelProperty(value = "企业信用代码") + private String creditCode; + + @TableField(exist = false) + @ApiModelProperty(value = "企业法定代表人") + private String legalPerson; + + @TableField(exist = false) + @ApiModelProperty(value = "企业法定代表人电话") + private String legalPersonTel; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java index c812b3f..abfc047 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMainMapper.java @@ -15,5 +15,5 @@ import java.util.List; @Mapper public interface EnterpriseMainMapper extends BaseMapper { - List getList(String dictType, String enterpriseSn); + List getList(String enterpriseSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMapper.java index 77d7f45..e24da72 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EnterpriseMapper.java @@ -24,5 +24,5 @@ public interface EnterpriseMapper extends BaseMapper { EnterpriseVo getDetailById(@Param("enterpriseId") Long enterpriseId); - List listByMainType(@Param("mainType") Integer mainType, @Param("governmentSn") String governmentSn); + List listByMainType(@Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml index 7c83569..27fc17a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMainMapper.xml @@ -3,9 +3,9 @@ \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMapper.xml index d871b1e..d17b6ea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EnterpriseMapper.xml @@ -10,7 +10,7 @@