diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java index f54e56d..1454f94 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java @@ -5,6 +5,8 @@ @Data public class TermiteInfoSaveRequest { + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java index f54e56d..1454f94 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java @@ -5,6 +5,8 @@ @Data public class TermiteInfoSaveRequest { + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index 0b6ee63..e476c09 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -6,6 +6,7 @@ import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import java.util.List; +import java.util.Set; public interface IProjectInfoService { @@ -44,6 +45,13 @@ ProjectInfo selectDetail(Long id); /** + * 详细查询第三方客户端信息 + * + * @return 第三方客户端信息 + */ + ProjectInfo selectDetail(String projectCode); + + /** * 分页查询第三方客户端信息 * * @param request 分页参数 @@ -60,4 +68,7 @@ List selectList(ProjectInfoQueryRequest request); List getUploadApi(String sn); + + Set getUserProjectCodeList(Long userId); + } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java index f54e56d..1454f94 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java @@ -5,6 +5,8 @@ @Data public class TermiteInfoSaveRequest { + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index 0b6ee63..e476c09 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -6,6 +6,7 @@ import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import java.util.List; +import java.util.Set; public interface IProjectInfoService { @@ -44,6 +45,13 @@ ProjectInfo selectDetail(Long id); /** + * 详细查询第三方客户端信息 + * + * @return 第三方客户端信息 + */ + ProjectInfo selectDetail(String projectCode); + + /** * 分页查询第三方客户端信息 * * @param request 分页参数 @@ -60,4 +68,7 @@ List selectList(ProjectInfoQueryRequest request); List getUploadApi(String sn); + + Set getUserProjectCodeList(Long userId); + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index 3940590..3e1a784 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -3,12 +3,17 @@ import com.newfiber.common.core.exception.ServiceException; import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.redis.service.RedisService; import com.newfiber.termite.domain.ProjectInfo; import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +28,6 @@ @Resource private ProjectInfoMapper projectInfoMapper; - @Override public long insert(ProjectInfoSaveRequest request) { @@ -58,6 +62,17 @@ } @Override + public ProjectInfo selectDetail(String projectCode) { + ProjectInfoQueryRequest request = new ProjectInfoQueryRequest(); + request.setProjectCode(projectCode); + List projectInfoList = selectList(request); + if(CollectionUtils.isNotEmpty(projectInfoList)){ + return projectInfoList.get(0); + } + return null; + } + + @Override public List selectPage(ProjectInfoQueryRequest request) { return projectInfoMapper.selectByCondition(request); } @@ -71,4 +86,18 @@ public List getUploadApi(String sn){ return projectInfoMapper.selectUploadApiBySn(sn); } + + @Override + public Set getUserProjectCodeList(Long userId) { + List projectInfoList = list(); + Set projectCodeList = new HashSet<>(); + for(ProjectInfo projectInfo : projectInfoList){ + for(String projectUserId : projectInfo.getProjectUsers().split(",")){ + if(userId.toString().equals(projectUserId)){ + projectCodeList.add(projectInfo.getProjectCode()); + } + } + } + return projectCodeList; + } } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java index f54e56d..1454f94 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java @@ -5,6 +5,8 @@ @Data public class TermiteInfoSaveRequest { + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index 0b6ee63..e476c09 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -6,6 +6,7 @@ import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import java.util.List; +import java.util.Set; public interface IProjectInfoService { @@ -44,6 +45,13 @@ ProjectInfo selectDetail(Long id); /** + * 详细查询第三方客户端信息 + * + * @return 第三方客户端信息 + */ + ProjectInfo selectDetail(String projectCode); + + /** * 分页查询第三方客户端信息 * * @param request 分页参数 @@ -60,4 +68,7 @@ List selectList(ProjectInfoQueryRequest request); List getUploadApi(String sn); + + Set getUserProjectCodeList(Long userId); + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index 3940590..3e1a784 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -3,12 +3,17 @@ import com.newfiber.common.core.exception.ServiceException; import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.redis.service.RedisService; import com.newfiber.termite.domain.ProjectInfo; import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +28,6 @@ @Resource private ProjectInfoMapper projectInfoMapper; - @Override public long insert(ProjectInfoSaveRequest request) { @@ -58,6 +62,17 @@ } @Override + public ProjectInfo selectDetail(String projectCode) { + ProjectInfoQueryRequest request = new ProjectInfoQueryRequest(); + request.setProjectCode(projectCode); + List projectInfoList = selectList(request); + if(CollectionUtils.isNotEmpty(projectInfoList)){ + return projectInfoList.get(0); + } + return null; + } + + @Override public List selectPage(ProjectInfoQueryRequest request) { return projectInfoMapper.selectByCondition(request); } @@ -71,4 +86,18 @@ public List getUploadApi(String sn){ return projectInfoMapper.selectUploadApiBySn(sn); } + + @Override + public Set getUserProjectCodeList(Long userId) { + List projectInfoList = list(); + Set projectCodeList = new HashSet<>(); + for(ProjectInfo projectInfo : projectInfoList){ + for(String projectUserId : projectInfo.getProjectUsers().split(",")){ + if(userId.toString().equals(projectUserId)){ + projectCodeList.add(projectInfo.getProjectCode()); + } + } + } + return projectCodeList; + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index f56e1a6..c029d89 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.security.utils.SecurityUtils; import com.newfiber.termite.domain.OneByOneNow; import com.newfiber.termite.domain.Termite; import com.newfiber.termite.domain.dto.*; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IProjectInfoService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.util.FileUploadUtils; import com.newfiber.termite.util.MinioConfig; @@ -47,6 +49,9 @@ @Resource private RestTemplate restTemplate; + @Resource + private IProjectInfoService projectInfoService; + public DataUpResponse termiteDataup(TermiteDataDto dataDto, MultipartFile image) throws Exception{ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String fileName = FileUploadUtils.extractFilename(image); @@ -90,6 +95,9 @@ @Override public List querytermiteData(TermiteInfoQueryRequest request){ + if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ + request.setProjectCodeList(projectInfoService.getUserProjectCodeList(SecurityUtils.getUserId())); + } return termiteMapper.querytermiteData(request); } diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java index f54e56d..1454f94 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java @@ -5,6 +5,8 @@ @Data public class TermiteInfoSaveRequest { + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index 0b6ee63..e476c09 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -6,6 +6,7 @@ import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import java.util.List; +import java.util.Set; public interface IProjectInfoService { @@ -44,6 +45,13 @@ ProjectInfo selectDetail(Long id); /** + * 详细查询第三方客户端信息 + * + * @return 第三方客户端信息 + */ + ProjectInfo selectDetail(String projectCode); + + /** * 分页查询第三方客户端信息 * * @param request 分页参数 @@ -60,4 +68,7 @@ List selectList(ProjectInfoQueryRequest request); List getUploadApi(String sn); + + Set getUserProjectCodeList(Long userId); + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index 3940590..3e1a784 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -3,12 +3,17 @@ import com.newfiber.common.core.exception.ServiceException; import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.redis.service.RedisService; import com.newfiber.termite.domain.ProjectInfo; import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +28,6 @@ @Resource private ProjectInfoMapper projectInfoMapper; - @Override public long insert(ProjectInfoSaveRequest request) { @@ -58,6 +62,17 @@ } @Override + public ProjectInfo selectDetail(String projectCode) { + ProjectInfoQueryRequest request = new ProjectInfoQueryRequest(); + request.setProjectCode(projectCode); + List projectInfoList = selectList(request); + if(CollectionUtils.isNotEmpty(projectInfoList)){ + return projectInfoList.get(0); + } + return null; + } + + @Override public List selectPage(ProjectInfoQueryRequest request) { return projectInfoMapper.selectByCondition(request); } @@ -71,4 +86,18 @@ public List getUploadApi(String sn){ return projectInfoMapper.selectUploadApiBySn(sn); } + + @Override + public Set getUserProjectCodeList(Long userId) { + List projectInfoList = list(); + Set projectCodeList = new HashSet<>(); + for(ProjectInfo projectInfo : projectInfoList){ + for(String projectUserId : projectInfo.getProjectUsers().split(",")){ + if(userId.toString().equals(projectUserId)){ + projectCodeList.add(projectInfo.getProjectCode()); + } + } + } + return projectCodeList; + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index f56e1a6..c029d89 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.security.utils.SecurityUtils; import com.newfiber.termite.domain.OneByOneNow; import com.newfiber.termite.domain.Termite; import com.newfiber.termite.domain.dto.*; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IProjectInfoService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.util.FileUploadUtils; import com.newfiber.termite.util.MinioConfig; @@ -47,6 +49,9 @@ @Resource private RestTemplate restTemplate; + @Resource + private IProjectInfoService projectInfoService; + public DataUpResponse termiteDataup(TermiteDataDto dataDto, MultipartFile image) throws Exception{ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String fileName = FileUploadUtils.extractFilename(image); @@ -90,6 +95,9 @@ @Override public List querytermiteData(TermiteInfoQueryRequest request){ + if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ + request.setProjectCodeList(projectInfoService.getUserProjectCodeList(SecurityUtils.getUserId())); + } return termiteMapper.querytermiteData(request); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml index 6478f38..5a537f8 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml @@ -12,6 +12,10 @@ + + + + @@ -28,6 +32,10 @@ , t.upload_api , t.field_explain , t.remark + , t.production_users + , t.install_users + , t.analysis_users + , t.center_point , t.status , t.del_flag , t.create_by @@ -40,6 +48,9 @@ and t.project_name like concat('%', #{request.projectName}, '%') + + and t.project_code =#{request.projectCode} + diff --git a/doc/upgrade.sql b/doc/upgrade.sql new file mode 100644 index 0000000..7e6bd7e --- /dev/null +++ b/doc/upgrade.sql @@ -0,0 +1,10 @@ +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `production_users` VARCHAR(512) NULL COMMENT '生产人员' AFTER `field_explain`, +ADD COLUMN `install_users` VARCHAR(512) NULL COMMENT '安装人员' AFTER `production_users`, +ADD COLUMN `analysis_users` VARCHAR(512) NULL COMMENT '分析人员' AFTER `install_users`; + +ALTER TABLE `newfiber_standard_termite`.`ter_device_info` +ADD COLUMN `category` VARCHAR(32) NULL DEFAULT 'project' COMMENT '分类（生产 production | 项目 project）' AFTER `id`; + +ALTER TABLE `newfiber_standard_termite`.`ter_project_info` +ADD COLUMN `center_point` VARCHAR(128) NULL COMMENT '地图中心点' AFTER `analysis_users`; diff --git a/newfiber-gateway/src/main/resources/bootstrap.yml b/newfiber-gateway/src/main/resources/bootstrap.yml index 27254f1..c72b701 100644 --- a/newfiber-gateway/src/main/resources/bootstrap.yml +++ b/newfiber-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml index eff5049..e1fcf5e 100644 --- a/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml +++ b/newfiber-system/newfiber-system-package/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ discovery: # 服务注册地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite config: # 配置中心地址 server-addr: 192.168.16.99:8848 - namespace: newfiber-standard + namespace: newfiber-termite # 配置文件格式 file-extension: yml # 共享配置 diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java index 1ad9dfd..1cd619d 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/controller/ProjectInfoController.java @@ -71,6 +71,15 @@ } /** + * 详细查询项目信息 + */ + @GetMapping(value = "/detailByCode/{projectCode}") + @ApiOperation(value = "详细查询项目信息", position = 40) + public Result detailByCode(@PathVariable("projectCode") String projectCode) { + return success(projectInfoService.selectDetail(projectCode)); + } + + /** * 分页查询项目信息 */ @GetMapping("/page") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java index d9ed75e..ce24347 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/ProjectInfo.java @@ -1,11 +1,18 @@ package com.newfiber.termite.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.newfiber.common.core.utils.StringUtils; import com.newfiber.common.core.web.domain.BaseEntity; +import com.newfiber.common.security.utils.UserUtils; +import com.newfiber.system.api.domain.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.collections4.CollectionUtils; @Data @TableName("ter_project_info") @@ -40,4 +47,84 @@ @ApiModelProperty(value = "字段解释") private String fieldExplain; + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + + /** + * 生产人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "生产人员") + private String productionUserNames; + + /** + * 安装人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "安装人员") + private String installUserNames; + + /** + * 分析人员 + */ + @TableField(exist = false) + @ApiModelProperty(value = "分析人员") + private String analysisUserNames; + + /** + * 项目人员（生产+安装+分析） + */ + @TableField(exist = false) + @ApiModelProperty(value = "项目人员（生产+安装+分析）", hidden = true) + private String projectUsers; + + public String getProjectUsers() { + return productionUsers + "," + installUsers + "," + analysisUsers; + } + + public String getProductionUserNames() { + return getUserNames(productionUsers); + } + + public String getInstallUserNames() { + return getUserNames(installUsers); + } + + public String getAnalysisUserNames() { + return getUserNames(analysisUsers); + } + + private String getUserNames(String userIds) { + List userName = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIds)){ + for(String userId : userIds.split(",")){ + SysUser sysUser = UserUtils.getUser(Long.parseLong(userId)); + if(null != sysUser){ + userName.add(sysUser.getNickName()); + } + } + } + return StringUtils.joinWith(",", userName); + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java index 039c057..9975cce 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoSaveRequest.java @@ -39,4 +39,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java index c2f9f73..7103515 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/ProjectInfoUpdateRequest.java @@ -43,4 +43,29 @@ */ @ApiModelProperty(value = "字段解释") private String fieldExplain; + + /** + * 生产人员 + */ + @ApiModelProperty(value = "生产人员") + private String productionUsers; + + /** + * 安装人员 + */ + @ApiModelProperty(value = "安装人员") + private String installUsers; + + /** + * 分析人员 + */ + @ApiModelProperty(value = "分析人员") + private String analysisUsers; + + /** + * 地图中心点 + */ + @ApiModelProperty(value = "地图中心点") + private String centerPoint; + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java index fff4a8f..0ca888b 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoQueryRequest.java @@ -1,6 +1,9 @@ package com.newfiber.termite.domain.request; +import com.newfiber.common.core.enums.EBoolean; +import com.newfiber.common.security.utils.SecurityUtils; import io.swagger.annotations.ApiModelProperty; +import java.util.Set; import lombok.Data; @Data @@ -21,6 +24,9 @@ @ApiModelProperty(value = "项目编码") private String projectCode; + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; - + @ApiModelProperty(value = "项目编码") + private Set projectCodeList; } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java index f54e56d..1454f94 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/domain/request/TermiteInfoSaveRequest.java @@ -5,6 +5,8 @@ @Data public class TermiteInfoSaveRequest { + @ApiModelProperty(value = "分类（生产 production | 项目 project）") + private String category; @ApiModelProperty(value = "设备编号") private String sn; @ApiModelProperty(value = "设备地址") diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java index 0b6ee63..e476c09 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/IProjectInfoService.java @@ -6,6 +6,7 @@ import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import java.util.List; +import java.util.Set; public interface IProjectInfoService { @@ -44,6 +45,13 @@ ProjectInfo selectDetail(Long id); /** + * 详细查询第三方客户端信息 + * + * @return 第三方客户端信息 + */ + ProjectInfo selectDetail(String projectCode); + + /** * 分页查询第三方客户端信息 * * @param request 分页参数 @@ -60,4 +68,7 @@ List selectList(ProjectInfoQueryRequest request); List getUploadApi(String sn); + + Set getUserProjectCodeList(Long userId); + } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java index 3940590..3e1a784 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/ProjectInfoServiceImpl.java @@ -3,12 +3,17 @@ import com.newfiber.common.core.exception.ServiceException; import com.newfiber.common.core.web.domain.BaseEntity; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.redis.service.RedisService; import com.newfiber.termite.domain.ProjectInfo; import com.newfiber.termite.domain.request.ProjectInfoQueryRequest; import com.newfiber.termite.domain.request.ProjectInfoSaveRequest; import com.newfiber.termite.domain.request.ProjectInfoUpdateRequest; import com.newfiber.termite.mapper.ProjectInfoMapper; import com.newfiber.termite.service.IProjectInfoService; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +28,6 @@ @Resource private ProjectInfoMapper projectInfoMapper; - @Override public long insert(ProjectInfoSaveRequest request) { @@ -58,6 +62,17 @@ } @Override + public ProjectInfo selectDetail(String projectCode) { + ProjectInfoQueryRequest request = new ProjectInfoQueryRequest(); + request.setProjectCode(projectCode); + List projectInfoList = selectList(request); + if(CollectionUtils.isNotEmpty(projectInfoList)){ + return projectInfoList.get(0); + } + return null; + } + + @Override public List selectPage(ProjectInfoQueryRequest request) { return projectInfoMapper.selectByCondition(request); } @@ -71,4 +86,18 @@ public List getUploadApi(String sn){ return projectInfoMapper.selectUploadApiBySn(sn); } + + @Override + public Set getUserProjectCodeList(Long userId) { + List projectInfoList = list(); + Set projectCodeList = new HashSet<>(); + for(ProjectInfo projectInfo : projectInfoList){ + for(String projectUserId : projectInfo.getProjectUsers().split(",")){ + if(userId.toString().equals(projectUserId)){ + projectCodeList.add(projectInfo.getProjectCode()); + } + } + } + return projectCodeList; + } } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java index f56e1a6..c029d89 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java +++ b/newfiber-termites/newfiber-termites-dataup/src/main/java/com/newfiber/termite/service/impl/TermiteServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.newfiber.common.core.web.service.BaseServiceImpl; +import com.newfiber.common.security.utils.SecurityUtils; import com.newfiber.termite.domain.OneByOneNow; import com.newfiber.termite.domain.Termite; import com.newfiber.termite.domain.dto.*; @@ -12,6 +13,7 @@ import com.newfiber.termite.domain.response.DataUpResponse; import com.newfiber.termite.domain.response.TermiteInfoResponse; import com.newfiber.termite.mapper.TermiteMapper; +import com.newfiber.termite.service.IProjectInfoService; import com.newfiber.termite.service.ITermiteService; import com.newfiber.termite.util.FileUploadUtils; import com.newfiber.termite.util.MinioConfig; @@ -47,6 +49,9 @@ @Resource private RestTemplate restTemplate; + @Resource + private IProjectInfoService projectInfoService; + public DataUpResponse termiteDataup(TermiteDataDto dataDto, MultipartFile image) throws Exception{ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String fileName = FileUploadUtils.extractFilename(image); @@ -90,6 +95,9 @@ @Override public List querytermiteData(TermiteInfoQueryRequest request){ + if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){ + request.setProjectCodeList(projectInfoService.getUserProjectCodeList(SecurityUtils.getUserId())); + } return termiteMapper.querytermiteData(request); } diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml index 6478f38..5a537f8 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/ProjectInfoMapper.xml @@ -12,6 +12,10 @@ + + + + @@ -28,6 +32,10 @@ , t.upload_api , t.field_explain , t.remark + , t.production_users + , t.install_users + , t.analysis_users + , t.center_point , t.status , t.del_flag , t.create_by @@ -40,6 +48,9 @@ and t.project_name like concat('%', #{request.projectName}, '%') + + and t.project_code =#{request.projectCode} + diff --git a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml index 2e61248..1f67076 100644 --- a/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml +++ b/newfiber-termites/newfiber-termites-dataup/src/main/resources/mapper/termite/TermiteMapper.xml @@ -17,6 +17,7 @@ SELECT ta.id as deviceId, tb.id, + ta.category, ta.sn, ta.location, ta.lonandlat, @@ -72,8 +73,18 @@ and th.project_code =#{request.projectCode} + + and ta.category =#{request.category} + + + and th.project_code in + + #{projectCode} + + order by -tb.yesnoant desc + +