approve

easydo-chengfa/pom.xml

@@ -93,6 +93,10 @@
             <artifactId>gson</artifactId>
             <version>2.8.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-json</artifactId>
+        </dependency>
         <!-- <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>

easydo-chengfa/src/main/java/easydo/technology/config/WebJsonConverterConfig.java

@@ -1,36 +0,0 @@
-package easydo.technology.config;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-/*
- * Long类型返回到前端js
- * 出现丢失精度的问题解决方案
- */
-
-@EnableWebMvc
-@Configuration
-public class WebJsonConverterConfig implements WebMvcConfigurer {
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        SimpleModule simpleModule = new SimpleModule();
-        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-        //null属性不序列化
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        objectMapper.registerModule(simpleModule);
-        jackson2HttpMessageConverter.setObjectMapper(objectMapper);
-        converters.add(jackson2HttpMessageConverter);
-    }
-}

easydo-chengfa/src/main/java/easydo/technology/config/WebLogAspect.java

@@ -10,6 +10,7 @@ import org.aspectj.lang.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Profile;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -38,7 +39,7 @@ public class WebLogAspect {
 
     /**
      * 在切点之前织入
-     * 
+     *
      * @param joinPoint
      * @throws Throwable
      */
@@ -51,12 +52,12 @@ public class WebLogAspect {
         logger.info("URL======>{},Class Method======>{}.{},Request Args======>{},Ip======>{}", request.getRequestURL().toString(),
                 joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(),
                 new Gson().toJson(joinPoint.getArgs()),request.getRemoteAddr());
-       
+
     }
 
     /**
      * 在切点之后织入
-     * 
+     *
      * @throws Throwable
      */
     // @After("webLog()")
@@ -72,7 +73,7 @@ public class WebLogAspect {
 
     /**
      * 环绕
-     * 
+     *
      * @param proceedingJoinPoint
      * @return
      * @throws Throwable

easydo-chengfa/src/main/java/easydo/technology/config/exception/BizExceptionHandler.java

@@ -2,6 +2,7 @@ package easydo.technology.config.exception;
 
 import easydo.technology.exception.BizException;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindException;

easydo-chengfa/src/main/java/easydo/technology/model/GldDept.java

@@ -1,17 +1,19 @@
 package easydo.technology.model;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 @Data
 public class GldDept {
-    private Long id;
+    private String id;
     private String name;
     private Boolean deleted;
     private String type;
     private String createTime;
     private String updateTime;
     private String displayName;
-    private Long tenantId;
+    private String tenantId;
     private String treePath;
     private Boolean hasDeptRight;
     private String code;

easydo-chengfa/src/main/java/easydo/technology/model/GldMember.java

@@ -4,23 +4,23 @@ import lombok.Data;
 
 @Data
 public class GldMember {
-    private Long id;
+    private String id;
     private String deptName;
     private Boolean admin;
     private Boolean enabled;
     private String loginName;
     private String email;
     private String sex;
-    private Long deptId;
+    private String deptId;
     private Boolean active;
     private String updateTime;
     private String createTime;
     private Boolean isAdmin;
-    private Long userId;
-    private Long accountId;
+    private String userId;
+    private String accountId;
     private String phone;
     private String name;
-    private Long tenantId;
+    private String tenantId;
     private String gldAccountId;
 
 }

easydo-chengfa/src/main/java/easydo/technology/model/GldProject.java

@@ -4,18 +4,18 @@ import lombok.Data;
 
 @Data
 public class GldProject {
-    private Long id;
+    private String id;
     private String code;
     private String projectTypeCode;
     private String parentDeptName;
     private String address;
-    private Long deptId;
+    private String deptId;
     private String fullName;
     private Boolean active;
     private String simpleName;
     private String createTime;
     private String name;
     private String projectName;
-    private Long parentDeptId;
+    private String parentDeptId;
 
 }

easydo-chengfa/src/main/java/easydo/technology/model/GldTenant.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class GldTenant {
-    private Long id;
+    private String id;
     private String product;
     private String code;
     private String purpose;

easydo-chengfa/src/main/java/easydo/technology/quartz/task/JobTask.java

@@ -110,63 +110,63 @@ public class JobTask {
 
     // TODO: 2024-9-25 从广联达获取mdm项目
     protected void pullProjectFromGldMaster() throws Exception {
-        Connection connection = null;
-        try {
-            connection = dataSource.getConnection();
-            connection.setAutoCommit(false);
-
-            List<GldProject> existGLDList = jdbcClient.getJdbcList(new HashMap<>(), GldProject.class, connection);
-            List<ProjectInfo> existProjList = jdbcClient.getJdbcList(new HashMap<>(), ProjectInfo.class, connection);
-            List<GldProject> list = gldMasterService.getGetProject();
-            for (GldProject model : list) {
-                List<GldProject> filterList = existGLDList.stream().filter(exist -> model.getId().equals(exist.getId()))
-                        .collect(Collectors.toList());
-                if (filterList.size() > 0) {
-                    jdbcClient.jdbcUpdateById(model, connection);
-                } else {
-                    jdbcClient.jdbcInsert(model, connection);
-                }
-                List<ProjectInfo> filterProjList = existProjList.stream()
-                        .filter(exist -> model.getId().equals(exist.getId())).collect(Collectors.toList());
-                ProjectInfo info = new ProjectInfo();
-                info.setId(model.getId());
-                info.setProjectAddr(model.getAddress());
-                info.setProjectName(model.getProjectName());
-                info.setProjectNo(model.getCode());
-                if (model.getActive()) {
-                    info.setProjectStatus("active");
-                } else {
-                    info.setProjectStatus("inactive");
-                }
-                info.setGldProjectId(null);
-                GldDept gldDept = new GldDept();
-                gldDept.setId(model.getDeptId());
-                gldDept = jdbcClient.getJdbcModel(gldDept, connection);
-                if (StringUtil.isEmpty(gldDept.getCode())) {
-                    continue;
-                }
-                SysDept dept = new SysDept();
-                dept.setCode(gldDept.getCode());
-                dept = jdbcClient.getJdbcModel(dept, connection);
-                if (StringUtil.isEmpty(dept.getDeptId())) {
-                    info.setDeptId((long) 1);
-                } else {
-                    info.setDeptId(dept.getDeptId());
-                }
-
-                if (filterProjList.size() > 0) {
-                    jdbcClient.jdbcUpdateById(info, connection);
-                } else {
-                    jdbcClient.jdbcInsert(info, connection);
-                }
-            }
-            connection.commit();
-        } catch (Exception e) {
-            connection.rollback();
-            throw e;
-        } finally {
-            jdbcClient.finallyExecute(connection);
-        }
+//        Connection connection = null;
+//        try {
+//            connection = dataSource.getConnection();
+//            connection.setAutoCommit(false);
+//
+//            List<GldProject> existGLDList = jdbcClient.getJdbcList(new HashMap<>(), GldProject.class, connection);
+//            List<ProjectInfo> existProjList = jdbcClient.getJdbcList(new HashMap<>(), ProjectInfo.class, connection);
+//            List<GldProject> list = gldMasterService.getGetProject();
+//            for (GldProject model : list) {
+//                List<GldProject> filterList = existGLDList.stream().filter(exist -> model.getId().equals(exist.getId()))
+//                        .collect(Collectors.toList());
+//                if (filterList.size() > 0) {
+//                    jdbcClient.jdbcUpdateById(model, connection);
+//                } else {
+//                    jdbcClient.jdbcInsert(model, connection);
+//                }
+//                List<ProjectInfo> filterProjList = existProjList.stream()
+//                        .filter(exist -> model.getId().equals(exist.getId())).collect(Collectors.toList());
+//                ProjectInfo info = new ProjectInfo();
+//                info.setId(model.getId());
+//                info.setProjectAddr(model.getAddress());
+//                info.setProjectName(model.getProjectName());
+//                info.setProjectNo(model.getCode());
+//                if (model.getActive()) {
+//                    info.setProjectStatus("active");
+//                } else {
+//                    info.setProjectStatus("inactive");
+//                }
+//                info.setGldProjectId(null);
+//                GldDept gldDept = new GldDept();
+//                gldDept.setId(model.getDeptId());
+//                gldDept = jdbcClient.getJdbcModel(gldDept, connection);
+//                if (StringUtil.isEmpty(gldDept.getCode())) {
+//                    continue;
+//                }
+//                SysDept dept = new SysDept();
+//                dept.setCode(gldDept.getCode());
+//                dept = jdbcClient.getJdbcModel(dept, connection);
+//                if (StringUtil.isEmpty(dept.getDeptId())) {
+//                    info.setDeptId((long) 1);
+//                } else {
+//                    info.setDeptId(dept.getDeptId());
+//                }
+//
+//                if (filterProjList.size() > 0) {
+//                    jdbcClient.jdbcUpdateById(info, connection);
+//                } else {
+//                    jdbcClient.jdbcInsert(info, connection);
+//                }
+//            }
+//            connection.commit();
+//        } catch (Exception e) {
+//            connection.rollback();
+//            throw e;
+//        } finally {
+//            jdbcClient.finallyExecute(connection);
+//        }
     }
 
     protected void pullTenantFromGldMaster() throws Exception {

easydo-chengfa/src/main/java/easydo/technology/service/GLDApproveService.java

@@ -136,7 +136,7 @@ public class GLDApproveService {
         return resObj.getString("id");
     }
 
-    public GLDApproveVo getApproveInfo(GLDApproveVo vo) {
+    public GLDApproveVo getApproveInfo(GLDApproveVo vo) throws Exception{
         String url = host + getApproveInfo.replace("{deptId}", mgtGroupId)
                 .replace("{ids}", vo.getTaskId());
         Map<String, String> header = new HashMap<>();
@@ -165,7 +165,7 @@ public class GLDApproveService {
 //        log.info("查询审批流res========>" + resArray.toJSONString());
 //    }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         Map<String, String> header = new HashMap<>();
         header.put("X-CORAL-TENANT", "5600003");
         header.put("Authorization", "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w=");

easydo-chengfa/src/main/java/easydo/technology/service/GLDCostService.java

@@ -36,7 +36,7 @@ public class GLDCostService {
     @Value("${GLD.COST.contractFile}")
     String costContractFile;
 
-    public JSONObject getHY(List<String> projectCodeList) {
+    public JSONObject getHY(List<String> projectCodeList) throws Exception {
         JSONObject data = new JSONObject();
         if (projectCodeList.isEmpty()) {
             throw new BizException("参数缺失");
@@ -53,7 +53,7 @@ public class GLDCostService {
         return resObj;
     }
 
-    public JSONObject getKM(List<String> projectCodeList) {
+    public JSONObject getKM(List<String> projectCodeList) throws Exception {
         JSONObject data = new JSONObject();
 
         if (StringUtil.isEmpty(tenantId) || projectCodeList.isEmpty()) {
@@ -72,7 +72,7 @@ public class GLDCostService {
         return resObj;
     }
 
-    public void updateState(Long contractPlanId, String useState) {
+    public void updateState(Long contractPlanId, String useState) throws Exception {
         JSONObject data = new JSONObject();
         List<Long> contractPlanIds = new ArrayList<>();
         contractPlanIds.add(contractPlanId);
@@ -91,7 +91,7 @@ public class GLDCostService {
         }
     }
 
-    public List<GLDContract> getContractList(String projectCode, String purchaseNo) {
+    public List<GLDContract> getContractList(String projectCode, String purchaseNo) throws Exception{
         JSONObject data = new JSONObject();
         data.put("projectCode", projectCode);
         data.put("procurementApprovalCode", purchaseNo);
@@ -135,7 +135,7 @@ public class GLDCostService {
         return list;
     }
 
-    public void getContractFile(String objectId, String fileName, HttpServletRequest request, HttpServletResponse response) {
+    public void getContractFile(String objectId, String fileName, HttpServletRequest request, HttpServletResponse response) throws Exception{
         String url = costHost + costContractFile + objectId;
         Map<String, String> header = new HashMap<>();
         header.put("Authorization", costAuthorization);
@@ -193,7 +193,7 @@ public class GLDCostService {
     // }
 
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception{
         JSONObject data = new JSONObject();
         data.put("projectId", "11200363");
         // data.put("projectCode", projectCode);

easydo-chengfa/src/main/java/easydo/technology/service/GLDMasterService.java

@@ -49,7 +49,7 @@ public class GLDMasterService {
     @Resource
     RedisUtils redisUtils;
 
-    public String getGetToken() {
+    public String getGetToken() throws Exception{
         if (redisUtils.hasKey(RedisKeyEnum.KEY_CF_GLD_MASTER_GET_TOKEN.getValue())) {
             return redisUtils.get(RedisKeyEnum.KEY_CF_GLD_MASTER_GET_TOKEN.getValue()).toString();
         } else {

easydo-chengfa/src/main/java/easydo/technology/service/OAService.java

@@ -49,7 +49,7 @@ public class OAService {
     @Resource
     JdbcClient jdbcClient;
 
-    public String getGetToken() {
+    public String getGetToken() throws Exception{
         String url = host + getTokenPath;
         JSONObject object = new JSONObject();
         object.put("userName", username);
@@ -62,7 +62,7 @@ public class OAService {
         return resObject.getString("id");
     }
 
-    public String getUsername(String ticket) {
+    public String getUsername(String ticket) throws Exception{
         String getLoginNameUrl = host + oaUsernamePath + ticket;
 
         String uuid = UUID.randomUUID().toString();
@@ -72,7 +72,7 @@ public class OAService {
         return HttpClientUtil.sendOaGET_USERNAME(getLoginNameUrl);
     }
 
-    public String getTelNumber(String username) {
+    public String getTelNumber(String username) throws Exception{
         String token = getGetToken();
         String getLoginNameUrl = host + oaUserInfoPath + token;
         Map<String, String> header = new HashMap<>();
@@ -130,7 +130,6 @@ public class OAService {
         Map<String, String> header = new HashMap<>();
         header.put("token", token);
         JSONObject object = new JSONObject();
-        object = new JSONObject();
         object.put("registerCode", registerCode);
         object.put("taskId", taskId);
         object.put("state", state);

easydo-chengfa/src/main/resources/config/application-dev.yml

@@ -191,7 +191,7 @@ GLD:
     authorization: "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w="
 
 PURCHASE:
-  redirectUrl: "http://localhost:7800/#/redirect"
+  redirectUrl: "http://localhost:7801/#/redirect"
   purchasePath: "process-form-infor"
   supplierPath: "supplier-evaluation-detail"
   requestUrl: "http://192.168.101.93:8810/purchase/getDetail?"

easydo-chengfa/src/main/resources/config/application-prod.yml

@@ -189,10 +189,10 @@ GLD:
     authorization: "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w="
 
 PURCHASE:
-  redirectUrl: "http://172.16.1.132:8800/#/redirect"
+  redirectUrl: "http://218.201.101.181:8800/#/redirect"
   purchasePath: "process-form-view"
   supplierPath: "supplier-evaluation-detail"
-  requestUrl: "http://172.16.1.132:8810/purchase/getDetail?"
+  requestUrl: "http://218.201.101.181:8810/purchase/getDetail?"
 
 MDM:
   host: "http://"

easydo-common/src/main/java/easydo/technology/utils/ThrowableUtil.java

@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package easydo.technology.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * 异常工具 2019-01-06
+ *
+ * @author Zheng Jie
+ */
+public class ThrowableUtil {
+
+    /**
+     * 获取堆栈信息
+     */
+    public static String getStackTrace(Throwable throwable) {
+        StringWriter sw = new StringWriter();
+        try (PrintWriter pw = new PrintWriter(sw)) {
+            throwable.printStackTrace(pw);
+            return sw.toString();
+        }
+    }
+}

easydo-system/src/main/java/easydo/technology/system/domain/SysJob.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class SysJob {
-    private Integer id;
+    private Long id;
     private String name;
     private Boolean enabled;
     private Integer jobSort;

easydo-system/src/main/java/easydo/technology/system/domain/SysUsersJobs.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 @Data
 public class SysUsersJobs {
-    private Integer id;
-    private Integer userId;
-    private Integer jobId;
+    private Long id;
+    private Long userId;
+    private Long jobId;
 }

easydo-system/src/main/java/easydo/technology/system/rest/UserController.java

@@ -79,7 +79,7 @@ public class UserController {
     // 该注解会影响前端用户查询用户列表，先干掉，后续有需求斟酌一下再打开
     @PreAuthorize("@el.check('user:list')")
 */
-    public ResponseEntity<Object> query(UserQueryParam criteria, Pageable pageable) {
+    public ResponseEntity<Object> query(UserQueryParam criteria, Pageable pageable) throws Exception{
         if (!ObjectUtils.isEmpty(criteria.getDeptId())) {
             criteria.getDeptIds().add(criteria.getDeptId());
             criteria.getDeptIds().addAll(deptService.getDeptChildren(criteria.getDeptId(),

easydo-system/src/main/java/easydo/technology/system/service/impl/UserServiceImpl.java

@@ -93,7 +93,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     }).collect(Collectors.toSet()));
                 }
                 SysUsersJobs sysUsersJobs = new SysUsersJobs();
-                sysUsersJobs.setUserId(user.getId().intValue());
+                sysUsersJobs.setUserId(user.getId());
                 List<SysUsersJobs> usersJobs = jdbcClient.getJdbcList(sysUsersJobs);
 
                 user.setJobs(usersJobs.stream().map(ur -> {
@@ -198,9 +198,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (CollectionUtils.isNotEmpty(resources.getJobs())) {
             resources.getJobs().forEach(job -> {
                 SysUsersJobs sysUsersJobs = new SysUsersJobs();
-                sysUsersJobs.setId(0);
-                sysUsersJobs.setJobId(job.getId().intValue());
-                sysUsersJobs.setUserId(userId.intValue());
+                sysUsersJobs.setId((long)0);
+                sysUsersJobs.setJobId(job.getId());
+                sysUsersJobs.setUserId(userId);
                 try {
                     jdbcClient.jdbcInsert(sysUsersJobs);
                 } catch (Exception e) {
@@ -249,7 +249,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         if (CollectionUtils.isNotEmpty(resources.getJobs())) {
             SysUsersJobs sysUsersJobs = new SysUsersJobs();
-            sysUsersJobs.setUserId(resources.getId().intValue());
+            sysUsersJobs.setUserId(resources.getId());
             try {
                 jdbcClient.jdbcRemove(sysUsersJobs);
             } catch (Exception e) {
@@ -257,9 +257,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             }
             resources.getJobs().stream().forEach(job -> {
                 SysUsersJobs sysUsersJob = new SysUsersJobs();
-                sysUsersJob.setId(0);
-                sysUsersJob.setJobId(job.getId().intValue());
-                sysUsersJob.setUserId(resources.getId().intValue());
+                sysUsersJob.setId((long)0);
+                sysUsersJob.setJobId(job.getId());
+                sysUsersJob.setUserId(resources.getId());
                 try {
                     jdbcClient.jdbcInsert(sysUsersJob);
                 } catch (Exception e) {