From 2a03489c93143c5c0999db981a3faecf35f7cbed Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Thu, 7 Sep 2023 17:56:51 +0800 Subject: [PATCH 1/5] 9.7 --- supervise-enterprise-ui/.env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervise-enterprise-ui/.env.production b/supervise-enterprise-ui/.env.production index 811f3444..c4d0fd79 100644 --- a/supervise-enterprise-ui/.env.production +++ b/supervise-enterprise-ui/.env.production @@ -2,7 +2,7 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/api/service' +VUE_APP_BASE_API = '/api' ## 配置 正式接口地址 VUE_APP_URL = "http://120.46.131.15:8111" From 4d0f6aa517d17edc1f0876ba20534ecc08769b66 Mon Sep 17 00:00:00 2001 From: liupopo Date: Thu, 7 Sep 2023 18:46:04 +0800 Subject: [PATCH 2/5] 11 --- 项目说明.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/项目说明.txt b/项目说明.txt index 312c2f3e..4c50567e 100644 --- a/项目说明.txt +++ b/项目说明.txt @@ -8,5 +8,8 @@ supervise/yxt-supervise-dbcenter yxt-supervise-dbcenter-biz-0.0.1.jar 端口号 山海光伏 guangfu/yxt-supervise-gf yxt-supervise-gf-biz-0.0.1.jar 端口号：7102 +环境监控模块 +jianguan/supervise-monitor yxt-supervise-monitor-biz-0.0.1.jar 端口号：7103 + 国大36524 -jianguan/yxt-supervise-gd36524 yxt-supervise-gf-biz-0.0.1.jar 端口号：7103 \ No newline at end of file +jianguan/yxt-supervise-gd36524 yxt-supervise-gd36524-biz-0.0.1.jar 端口号：7104 \ No newline at end of file From 33a33af5a8fbdbe782c7ac3253f09d28ea6e0d6a Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Fri, 8 Sep 2023 09:13:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?9-8=20=E7=99=BB=E5=BD=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A5=E4=BA=BA=E9=A1=B9=E7=9B=AEsid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/api/userproject/UserProjectFeign.java | 17 ++++++++++++ .../crm/biz/userproject/UserProjectRest.java | 9 +++++++ .../supervise/system/sysuser/SysUserVo.java | 2 ++ .../feign/crm/userproject/UserProject.java | 18 +++++++++++++ .../crm/userproject/UserProjectFeign.java | 26 +++++++++++++++++++ .../system/sysuser/SysUserService.java | 12 +++++++++ 6 files changed, 84 insertions(+) create mode 100644 yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java create mode 100644 yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java create mode 100644 yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java new file mode 100644 index 00000000..6aa3562a --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.userproject; + +import io.swagger.annotations.Api; +import org.springframework.cloud.openfeign.FeignClient; + + +/** + * @author feikefei + * @create 2023-09-07-9:06 + */ +@Api(tags = "用户项目表") +@FeignClient( + contextId = "supervise-crm-UserProject", + name = "supervise-crm", + path = "userproject") +public interface UserProjectFeign { +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java index 3af0c900..943d81a1 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java @@ -3,6 +3,7 @@ package com.yxt.supervise.crm.biz.userproject; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.userproject.UserProject; import com.yxt.supervise.crm.api.userproject.UserProjectDto; import com.yxt.supervise.crm.api.userproject.UserProjectQuery; import com.yxt.supervise.crm.api.userproject.UserProjectVo; @@ -81,4 +82,12 @@ public class UserProjectRest { return UserProjectService.getUsersByprojectSid(projectSid); } + @ApiOperation("根据userSid查询该人的项目") + @PostMapping("/getProjectSidByUserSid") + public ResultBean> getProjectSidByUserSid(@RequestParam("userSid") String userSid){ + ResultBean rb = ResultBean.fireFail(); + System.out.println(userSid); + List projectSidListByUserSid = UserProjectService.getProjectSidListByUserSid(userSid); + return rb.success().setData(projectSidListByUserSid); + } } diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java index 7248effd..95697a3f 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java @@ -91,4 +91,6 @@ public class SysUserVo implements Vo { @ApiModelProperty("工号") private String jobNumber; private String openid; + @ApiModelProperty("项目sid集合") + private List projectSidList; } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java new file mode 100644 index 00000000..8c78689d --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.feign.crm.userproject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-09-07-9:11 + */ +@Data +@TableName("user_project") +public class UserProject extends EntityWithId{ + private String sid; + private String projectSid; + private String userSid; + private String userType; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java new file mode 100644 index 00000000..8090cba4 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.feign.crm.userproject; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-09-07-9:06 + */ +@Api(tags = "用户项目表") +@FeignClient( + contextId = "supervise-crm-userProject", + name = "supervise-crm", + path = "userproject") +public interface UserProjectFeign { + @ApiOperation("根据userSid查询该人的项目") + @PostMapping("/getProjectSidByUserSid") + ResultBean> getProjectSidByUserSid(@RequestParam("userSid") String userSid); +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index 7a6b1d63..2fb0e9ec 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.supervise.feign.crm.userproject.UserProject; +import com.yxt.supervise.feign.crm.userproject.UserProjectFeign; import com.yxt.supervise.system.config.DictCommonType; import com.yxt.supervise.system.sysorganization.SysOrganization; import com.yxt.supervise.system.sysorganization.SysOrganizationService; @@ -44,6 +46,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.io.File; import java.util.*; import java.util.concurrent.ScheduledExecutorService; @@ -114,6 +117,8 @@ public class SysUserService extends MybatisBaseService { private SysUserRoleService userRoleService; @Autowired private UserOpenidService userOpenidService; + @Autowired + private UserProjectFeign userProjectFeign; public PagerVo listPage(PagerQuery pq) { @@ -344,6 +349,13 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setSid(user.getSid()); userInfoOneVo.setUserName(user.getUserName()); userInfoOneVo.setIsAdmin(user.getIsAdmin()); + ResultBean> projectSidByUserSid = userProjectFeign.getProjectSidByUserSid(user.getSid()); + List data = projectSidByUserSid.getData(); + List list = new ArrayList<>(); + for (UserProject datum : data) { + list.add(datum.getProjectSid()); + } + userInfoOneVo.setProjectSidList(list); //类型为员工的组织机构信息 if(user.getUserType().equals("3")){ From b0aba5328e7cf0ac1b92f6dbb878e6a9f534d9a7 Mon Sep 17 00:00:00 2001 From: "djz236@163.com" Date: Fri, 8 Sep 2023 10:04:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E7=AB=A0?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprisecentre/api/flowable/ProcDefEnum.java | 2 +- .../enterprisecentre/biz/sealrecord/SealRecordService.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-api/src/main/java/com/yxt/supervise/enterprisecentre/api/flowable/ProcDefEnum.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-api/src/main/java/com/yxt/supervise/enterprisecentre/api/flowable/ProcDefEnum.java index 87397dd7..022e3581 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-api/src/main/java/com/yxt/supervise/enterprisecentre/api/flowable/ProcDefEnum.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-api/src/main/java/com/yxt/supervise/enterprisecentre/api/flowable/ProcDefEnum.java @@ -7,7 +7,7 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - SEALSONAPPLICATION("用章申请", "process_itrg7ohf:2:1332504"); + SEALSONAPPLICATION("用章申请", "process_itrg7ohf:5:1340012"); ProcDefEnum(String proDefName, String proDefId) { this.proDefName = proDefName; diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java index aa9fd974..921847b2 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java @@ -80,6 +80,7 @@ public class SealRecordService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + qw.eq("1","1"); if(StringUtils.isNotBlank(query.getProject_sid())){ qw.eq("project_sid",query.getProject_sid()); } @@ -150,12 +151,10 @@ public class SealRecordService extends MybatisBaseService Date: Fri, 8 Sep 2023 10:07:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=A8=E7=AB=A0?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt_supervise/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/yxt_supervise/pom.xml b/yxt_supervise/pom.xml index 2439d41d..d828f0e8 100644 --- a/yxt_supervise/pom.xml +++ b/yxt_supervise/pom.xml @@ -16,6 +16,7 @@ supervise-system yxt_adapter supervise-rms + yxt-supervise-enterprisecentre supervise-crm supervise-flowable supervise-customer