admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口调整

Browse Source
This commit is contained in:
pengjie 2023-04-03 19:01:12 +08:00
parent 41e01ab95b
commit 0805c4b357
16 changed files with 83 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserController.java
View File

@ -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("住建局账号异常,请联系管理员");
}
}
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;
}

46
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java
View File

@ -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<IPage<Engineering>> queryPageList(@RequestBody Map<String, Object> map) {
QueryWrapper<Engineering> wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map);
Page<Engineering> page = PageUtil.getPage(map);
wrapper.orderByAsc("examine_state").orderByDesc("update_time");
IPage<Engineering> 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<Engineering> editPosition(@RequestBody Engineering engineering) {
Result<Engineering> result = new Result<Engineering>();
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<Engineering> queryById(@RequestBody Engineering engineeringEntity) {
Result<Engineering> result = new Result<Engineering>();
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<List<String>> queryDistrict() {
return Result.success(engineeringService.queryDistrict());
}
}

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AiMonitorDevController.java
View File

@ -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("添加成功！");
}

1
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java
View File

@ -51,6 +51,7 @@ public class EngineeringController {
public Result<IPage<Engineering>> queryPageList(@RequestBody Map<String, Object> map) {
LambdaQueryWrapper<Engineering> wrapper = Wrappers.<Engineering>lambdaQuery();
Page<Engineering> page = PageUtil.getPage(map);
wrapper.orderByDesc(Engineering::getCreateTime);
IPage<Engineering> pageList = engineeringService.getPageList(page, wrapper);
return Result.success(pageList);
}

6
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringMainPerson.java
View File

@ -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;
}

6
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Enterprise.java
View File

@ -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;
/**
* 企业登记注册类型
*/

6
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EnterpriseMainLicense.java
View File

@ -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
*/

10
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/EngineeringMainPersonMapper.java
View File

@ -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<EngineeringMainPerson> {
List<EngineeringMainPerson> getList(String engineeringSn);
}

5
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMainPersonMapper.xml
View File

@ -2,4 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.EngineeringMainPersonMapper">
<select id="getList" resultType="com.zhgd.xmgl.modules.basicdata.entity.EngineeringMainPerson">
SELECT p.*, d.dict_value as jobName FROM engineering_main_person p
LEFT JOIN system_dict_data d ON p.job_id = d.dict_label AND d.dict_type = 'engineering_post'
WHERE p.engineering_sn = #{engineeringSn}
</select>
</mapper>

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringMainPersonService.java
View File

@ -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<EngineeringMainPerson> {
List<EngineeringMainPerson> getList(String engineeringSn);
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IEngineeringService.java
View File

@ -27,6 +27,7 @@ public interface IEngineeringService extends IService<Engineering> {
List<String> getSnListByGov(String governmentSn);
EngineeringVo queryById(Long engineeringId);
List<String> getSnListByEnterprise(String enterpriseSn);
@ -42,5 +43,5 @@ public interface IEngineeringService extends IService<Engineering> {
Map<String, Object> appIndexStat();
boolean updatePosition(Engineering engineering);
List<String> queryDistrict();
}

6
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringMainPersonServiceImpl.java
View File

@ -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<EngineeringMainPersonMapper, EngineeringMainPerson> implements IEngineeringMainPersonService {
@Override
public List<EngineeringMainPerson> getList(String engineeringSn) {
return baseMapper.getList(engineeringSn);
}
}

20
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -141,13 +141,20 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
return baseMapper.getSnListByEnterprise(enterpriseSn, "ignoreDataScope");
}
@Override
public EngineeringVo queryById(Long engineeringId) {
EngineeringVo engineeringVo = baseMapper.getDetail(engineeringId);
return engineeringVo;
}
@Override
public EngineeringVo queryDetailById(Long engineeringId) {
EngineeringVo engineeringVo = baseMapper.getDetail(engineeringId);
engineeringVo.setEngineeringTypeName( systemDictDataService.getOne(Wrappers.<SystemDictData>lambdaQuery().eq(SystemDictData::getDictType, ParamEnum.SysDictType.ENGINEERING_TYPE.getValue())
.eq(SystemDictData::getDictLabel, engineeringVo.getEngineeringType())).getDictValue());
List<EngineeringSingle> engineeringSingles = engineeringSingleService.list(Wrappers.<EngineeringSingle>lambdaQuery().eq(EngineeringSingle::getEngineeringSn, engineeringVo.getEngineeringSn()));
List<EngineeringMain> engineeringMains = engineeringMainService.getList(engineeringVo.getEngineeringSn());
List<EngineeringMainPerson> engineeringMainPersons = engineeringMainPersonService.list(Wrappers.<EngineeringMainPerson>lambdaQuery()
.eq(EngineeringMainPerson::getEngineeringSn, engineeringVo.getEngineeringSn()));
List<EngineeringMainPerson> 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<EngineeringMapper, Engin
}
@Override
public boolean updatePosition(Engineering engineering) {
LambdaUpdateWrapper<Engineering> wrapper = Wrappers.<Engineering>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<String> queryDistrict() {
return this.list(Wrappers.<Engineering>lambdaQuery().select(Engineering::getDistrict).groupBy(Engineering::getDistrict))
.stream().map(e -> e.getDistrict()).collect(Collectors.toList());
}
}

4
src/main/resources/application-dev.properties
View File

@ -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

5
src/main/resources/application-test.properties
View File

@ -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

7
src/main/resources/application.properties
View File

@ -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