Merge remote-tracking branch 'origin/master'

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"

yxt_supervise/pom.xml

@@ -16,6 +16,7 @@
         <module>supervise-system</module>
         <module>yxt_adapter</module>
         <module>supervise-rms</module>
+        <module>yxt-supervise-enterprisecentre</module>
         <module>supervise-crm</module>
         <module>supervise-flowable</module>
         <module>supervise-customer</module>

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 {
+}

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<List<UserProject>> getProjectSidByUserSid(@RequestParam("userSid") String userSid){
+        ResultBean rb = ResultBean.fireFail();
+        System.out.println(userSid);
+        List<UserProject> projectSidListByUserSid = UserProjectService.getProjectSidListByUserSid(userSid);
+        return rb.success().setData(projectSidListByUserSid);
+    }
 }

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<String> projectSidList;
 }

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

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<List<UserProject>> getProjectSidByUserSid(@RequestParam("userSid") String userSid);
+}

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<SysUserMapper, SysUser> {
     private SysUserRoleService userRoleService;
     @Autowired
     private UserOpenidService userOpenidService;
+    @Autowired
+    private UserProjectFeign userProjectFeign;
 
 
     public PagerVo<SysUser> listPage(PagerQuery<SysUserQuery> pq) {
@@ -344,6 +349,13 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         userInfoOneVo.setSid(user.getSid());
         userInfoOneVo.setUserName(user.getUserName());
         userInfoOneVo.setIsAdmin(user.getIsAdmin());
+        ResultBean<List<UserProject>> projectSidByUserSid = userProjectFeign.getProjectSidByUserSid(user.getSid());
+        List<UserProject> data = projectSidByUserSid.getData();
+        List<String> list = new ArrayList<>();
+        for (UserProject datum : data) {
+            list.add(datum.getProjectSid());
+        }
+        userInfoOneVo.setProjectSidList(list);
         //类型为员工的组织机构信息
         if(user.getUserType().equals("3")){
 

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;

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<SealRecordMapper, Seal
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<SealRecord> 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<SealRecordMapper, Seal
 		}
 		if (StringUtils.isBlank(dtoSid)) {
 			SealRecord sealRecord = this.insertByDto(dto);
-			rb.setData(sealRecord.getSid());
+			return rb.success().setData(sealRecord.getSid());
-			return rb.success();
         } 
 		this.updateByDto(dto);
-		rb.setData(dto.getSid());
+		return rb.success().setData(dto.getSid());
-		return rb;
 	}
 	
 	public SealRecord  insertByDto(SealRecordDto dto){

项目说明.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
+jianguan/yxt-supervise-gd36524  yxt-supervise-gd36524-biz-0.0.1.jar  端口号：7104