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 d62955d..5195031 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.jeecg.common.constant.CommonConstant; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; import com.zhgd.xmgl.modules.basicdata.dto.SystemUserDto; @@ -335,10 +336,12 @@ public class SystemUserController { result.error500("住建局账号异常,请联系管理员"); } } - String token = jwtTokenProvider.createToken(userInfo.getAccount(), 3600 * 24); - userInfo.setToken(token); - result.setResult(userInfo); - result.setSuccess(true); + if (result.getCode() != CommonConstant.SC_INTERNAL_SERVER_ERROR_500) { + 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/government/GovEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java index 6e937c5..db09704 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java @@ -18,10 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; -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.servlet.http.HttpServletRequest; import java.util.List; @@ -64,6 +61,7 @@ public class GovEngineeringController { public Result> queryPageList(@RequestBody Map map) { QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map); Page page = PageUtil.getPage(map); + wrapper.orderByAsc("examine_state").orderByDesc("update_time"); IPage pageList = engineeringService.getPageList(page, wrapper); return Result.success(pageList); } @@ -106,33 +104,6 @@ public class GovEngineeringController { return result; } - /** - * 编辑 - * @param engineering - * @return - */ - @OperLog(operModul = "工程管理", operType = "编辑", operDesc = "修改工程定位信息") - @ApiOperation(value = "修改工程定位信息", notes = "修改工程定位信息" , httpMethod="POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "项目工程表ID", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "longitude", value = "经度", required = true, dataType = "String"), - @ApiImplicitParam(name = "latitude", value = "纬度", required = true, dataType = "String") - }) - @PostMapping(value = "/editPosition") - public Result editPosition(@RequestBody Engineering engineering) { - Result result = new Result(); - Engineering engineeringEntity = engineeringService.getById(engineering.getId()); - if(engineeringEntity==null) { - result.error500("未找到对应实体"); - }else { - boolean ok = engineeringService.updatePosition(engineering); - if(ok) { - result.success("修改成功!"); - } - } - return result; - } - /** * 通过id查询 * @@ -144,7 +115,7 @@ public class GovEngineeringController { @PostMapping(value = "/queryById") public Result queryById(@RequestBody Engineering engineeringEntity) { Result result = new Result(); - Engineering engineering = engineeringService.getById(engineeringEntity.getId()); + Engineering engineering = engineeringService.queryById(engineeringEntity.getId()); if (engineering == null) { result.error500("未找到对应实体"); } else { @@ -234,4 +205,15 @@ public class GovEngineeringController { } return result; } + + /** + * 查询工程区域 + * @return + */ + @OperLog(operModul = "工程管理", operType = "查询", operDesc = "查询工程区域") + @ApiOperation(value = "查询工程区域", notes = "查询工程区域", httpMethod = "GET") + @GetMapping(value = "/queryDistrict") + public Result> queryDistrict() { + return Result.success(engineeringService.queryDistrict()); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java index 0daa1b2..6c602e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; import java.util.Map; @@ -73,7 +72,6 @@ public class AiMonitorDevController { SecurityUser user = SecurityUtil.getUser(); aiMonitorDev.setProjectSn(user.getSn()); aiMonitorDev.setEngineeringSn(user.getEngineeringSn()); - aiMonitorDev.setCreateTime(new Date()); aiMonitorDevService.save(aiMonitorDev); return Result.ok("添加成功！"); } 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 b0af763..183a938 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 @@ -51,6 +51,7 @@ public class EngineeringController { public Result> queryPageList(@RequestBody Map map) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); Page page = PageUtil.getPage(map); + wrapper.orderByDesc(Engineering::getCreateTime); IPage pageList = engineeringService.getPageList(page, wrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java index c802c81..fe351d7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.entity; 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 io.swagger.annotations.ApiModel; @@ -76,4 +77,9 @@ public class EngineeringMainPerson implements Serializable { @Excel(name = "联系电话", width = 15) @ApiModelProperty(value = "联系电话") private String phone; + + + @TableField(exist = false) + @ApiModelProperty(value = "职务名称") + private String jobName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Enterprise.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Enterprise.java index fd1a438..fab9cb5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Enterprise.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Enterprise.java @@ -78,6 +78,12 @@ public class Enterprise implements Serializable { @Excel(name = "营业执照", width = 15) @ApiModelProperty(value = "营业执照") private String businessLicense; + /** + * 营业执照文件名 + */ + @Excel(name = "营业执照文件名", width = 15) + @ApiModelProperty(value = "营业执照文件名") + private String businessLicenseOriginalName; /** * 企业登记注册类型 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EnterpriseMainLicense.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EnterpriseMainLicense.java index 8008834..dc0d786 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EnterpriseMainLicense.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EnterpriseMainLicense.java @@ -58,6 +58,12 @@ public class EnterpriseMainLicense implements Serializable { @Excel(name = "资质附件", width = 15) @ApiModelProperty(value = "资质附件") private String licenseImage; + /** + * 资质附件原文件名 + */ + @Excel(name = "资质附件原文件名", width = 15) + @ApiModelProperty(value = "资质附件原文件名") + private String licenseImageOriginalName; /** * 企业sn */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainPersonMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainPersonMapper.java index 4df98d1..c8bb43c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainPersonMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainPersonMapper.java @@ -1,11 +1,10 @@ package com.zhgd.xmgl.modules.basicdata.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; /** * @Description: 工程主体负责人表 @@ -16,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface EngineeringMainPersonMapper extends BaseMapper { + List getList(String engineeringSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml index 4c7f11f..a3e62ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml @@ -2,4 +2,9 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainPersonService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainPersonService.java index 7b1af37..30d2cfc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainPersonService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainPersonService.java @@ -1,7 +1,9 @@ package com.zhgd.xmgl.modules.basicdata.service; -import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson; + +import java.util.List; /** * @Description: 工程主体负责人表 @@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IEngineeringMainPersonService extends IService { + List getList(String engineeringSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java index 666233f..564894d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java @@ -27,6 +27,7 @@ public interface IEngineeringService extends IService { List getSnListByGov(String governmentSn); + EngineeringVo queryById(Long engineeringId); List getSnListByEnterprise(String enterpriseSn); @@ -42,5 +43,5 @@ public interface IEngineeringService extends IService { Map appIndexStat(); - boolean updatePosition(Engineering engineering); + List queryDistrict(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainPersonServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainPersonServiceImpl.java index 623659a..eaab4ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainPersonServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainPersonServiceImpl.java @@ -7,6 +7,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; + /** * @Description: 工程主体负责人表 * @author： pds @@ -16,4 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class EngineeringMainPersonServiceImpl extends ServiceImpl implements IEngineeringMainPersonService { + @Override + public List getList(String engineeringSn) { + return baseMapper.getList(engineeringSn); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index aa0a346..dee2631 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -141,13 +141,20 @@ public class EngineeringServiceImpl extends ServiceImpllambdaQuery().eq(SystemDictData::getDictType, ParamEnum.SysDictType.ENGINEERING_TYPE.getValue()) + .eq(SystemDictData::getDictLabel, engineeringVo.getEngineeringType())).getDictValue()); List engineeringSingles = engineeringSingleService.list(Wrappers.lambdaQuery().eq(EngineeringSingle::getEngineeringSn, engineeringVo.getEngineeringSn())); List engineeringMains = engineeringMainService.getList(engineeringVo.getEngineeringSn()); - List engineeringMainPersons = engineeringMainPersonService.list(Wrappers.lambdaQuery() - .eq(EngineeringMainPerson::getEngineeringSn, engineeringVo.getEngineeringSn())); + List engineeringMainPersons = engineeringMainPersonService.getList(engineeringVo.getEngineeringSn()); for (EngineeringMain engineeringMain : engineeringMains) { engineeringMain.setEngineeringMainPersonList(engineeringMainPersons.stream().filter(l -> l .getMainId().equals(engineeringMain.getId())) @@ -194,11 +201,8 @@ public class EngineeringServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaUpdate(); - wrapper.set(Engineering::getLatitude, engineering.getLatitude()); - wrapper.set(Engineering::getLongitude, engineering.getLongitude()); - wrapper.eq(Engineering::getId, engineering.getId()); - return this.update(wrapper); + public List queryDistrict() { + return this.list(Wrappers.lambdaQuery().select(Engineering::getDistrict).groupBy(Engineering::getDistrict)) + .stream().map(e -> e.getDistrict()).collect(Collectors.toList()); } } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index db4c5d7..31a3554 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -15,6 +15,10 @@ basePath=D:/itbgpImage/ # mqtt主题 mqtt-scope=devTopic +# redis 配置 +spring.redis.database=1 +spring.redis.host=localhost +spring.redis.port=6379 #文件存储配置 spring.file-storage.default-platform=local spring.file-storage.thumbnail-suffix=.jpg diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index a534185..c151d22 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -13,6 +13,11 @@ basePath=D:/itbgpImage/ # mqtt主题 mqtt-scope=devTopic +# redis 配置 +spring.redis.database=1 +spring.redis.host=182.90.224.147 +spring.redis.password=JXJ@admin +spring.redis.port=6379 #文件存储配置 spring.file-storage.default-platform=local spring.file-storage.thumbnail-suffix=.jpg diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8bbf3db..83a35cd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -81,13 +81,6 @@ getui.appKey=wlPjAki13R8STuofcjnXM1 getui.appSecret=Wy3FFyaXzb9MUl94FMrLo1 getui.masterSecret=zZ5bMTOjUe5v3MFhm8gLL - -# redis 配置 -spring.redis.database=1 -spring.redis.host=182.90.224.147 -spring.redis.port=6379 -#spring.redis.password=JXJ@admin -spring.redis.password=JXJ@admin spring.redis.timeout=2000s spring.redis.lettuce.pool.max-active=8 spring.redis.lettuce.pool.max-wait=60s