Merge remote-tracking branch 'origin/master'

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -85,12 +85,6 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc.shibei</groupId>
-            <artifactId>epdc-optimize-department</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.esua.epdc.shibei</groupId>
             <artifactId>spring-boot-httpclient-starter</artifactId>

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/log/LogConsumer.java

@@ -64,39 +64,39 @@ public class LogConsumer implements CommandLineRunner {
     }
 
     private void receiveQueue() {
-        String key = RedisKeys.getSysLogKey();
+//        String key = RedisKeys.getSysLogKey();
-        //每次插入100条
+//        //每次插入100条
-        int count = 100;
+//        int count = 100;
-        for (int i = 0; i < count; i++) {
+//        for (int i = 0; i < count; i++) {
-            log.info("1日志存储开始-------------");
+//            log.info("1日志存储开始-------------");
-            BaseLog baseLog = (BaseLog) redisUtils.rightPop(key);
+//            BaseLog baseLog = (BaseLog) redisUtils.rightPop(key);
-            if (baseLog == null) {
+//            if (baseLog == null) {
-                return;
+//                return;
-            }
+//            }
-            //登录日志
+//            //登录日志
-            if (baseLog.getType() == LogTypeEnum.LOGIN.value()) {
+//            if (baseLog.getType() == LogTypeEnum.LOGIN.value()) {
-                SysLogLogin sysLogLogin = (SysLogLogin) baseLog;
+//                SysLogLogin sysLogLogin = (SysLogLogin) baseLog;
-                SysLogLoginEntity entity = ConvertUtils.sourceToTarget(sysLogLogin, SysLogLoginEntity.class);
+//                SysLogLoginEntity entity = ConvertUtils.sourceToTarget(sysLogLogin, SysLogLoginEntity.class);
-                log.info("1登录日志开始-------------"+entity.toString());
+//                log.info("1登录日志开始-------------"+entity.toString());
-                sysLogLoginService.save(entity);
+//                sysLogLoginService.save(entity);
-            }
+//            }
-
+//
-            //操作日志
+//            //操作日志
-            if (baseLog.getType() == LogTypeEnum.OPERATION.value()) {
+//            if (baseLog.getType() == LogTypeEnum.OPERATION.value()) {
-                SysLogOperation sysLogOperation = (SysLogOperation) baseLog;
+//                SysLogOperation sysLogOperation = (SysLogOperation) baseLog;
-                SysLogOperationEntity entity = ConvertUtils.sourceToTarget(sysLogOperation, SysLogOperationEntity.class);
+//                SysLogOperationEntity entity = ConvertUtils.sourceToTarget(sysLogOperation, SysLogOperationEntity.class);
-                log.info("操作日志开始-------------"+entity.toString());
+//                log.info("操作日志开始-------------"+entity.toString());
-                sysLogOperationService.save(entity);
+//                sysLogOperationService.save(entity);
-            }
+//            }
-
+//
-//            //异常日志
+////            //异常日志
-//            if (baseLog.getType() == LogTypeEnum.ERROR.value()) {
+////            if (baseLog.getType() == LogTypeEnum.ERROR.value()) {
-//                SysLogError logError = (SysLogError) baseLog;
+////                SysLogError logError = (SysLogError) baseLog;
-//                SysLogErrorEntity entity = ConvertUtils.sourceToTarget(logError, SysLogErrorEntity.class);
+////                SysLogErrorEntity entity = ConvertUtils.sourceToTarget(logError, SysLogErrorEntity.class);
-//                log.info("异常日志开始-------------"+entity.toString());
+////                log.info("异常日志开始-------------"+entity.toString());
-//                sysLogErrorService.save(entity);
+////                sysLogErrorService.save(entity);
+////            }
 //        }
-        }
     }
 
 }

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 6ce4c3d35f0cfb0d915e5c291f9e36155007a393
+Subproject commit afd07f546d032e9cc6889df29d315af6d32c0f4c

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit 89021d5b3e35ad1d3be88a03e19de146df5a0d70
+Subproject commit a783187c8dbbe5e048d157493b9b871c3ef35787

esua-epdc/epdc-cloud-parent-shibei

@@ -1 +1 @@
-Subproject commit 71857553cfca23b808dadbe177d8391509a50cbd
+Subproject commit 13aed64d573dd166c1cf120b8a5458a76e43082c

esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@@ -95,12 +95,6 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc.shibei</groupId>
-            <artifactId>epdc-custom-client</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.esua.epdc.shibei</groupId>
             <artifactId>epdc-points-client</artifactId>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -354,8 +354,8 @@ public class ApiAppUserController {
     @PostMapping("userloginlog")
     public Result save(@RequestBody UserLoginLogDTO dto) {
         //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+//        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        appUserService.save(dto);
+//        appUserService.save(dto);
         return new Result();
     }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@@ -17,7 +17,6 @@ import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO;
 import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO;
-import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO;
 import com.elink.esua.epdc.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -268,7 +268,7 @@ public class WorkUserServiceImpl implements WorkUserService {
         EpdcUnauthorizedAmountFromDTO unauthorizedFromDto = new EpdcUnauthorizedAmountFromDTO();
         unauthorizedFromDto.setGridId(formDto.getDeptId());
         Result<Integer> unauthorizedResult = this.getUnauthorizedAmount(unauthorizedFromDto);
-        Result<Integer> masterMesCount = masterGroupService.messageStatistics(SecurityUser.getUser().getId());
+//        Result<Integer> masterMesCount = masterGroupService.messageStatistics(SecurityUser.getUser().getId());
         // 组装返回数据
         List<WorkAppMenuStatisticsResultDTO> resultDtoList = new ArrayList<>();
         boolean isItem = false;
@@ -294,9 +294,9 @@ public class WorkUserServiceImpl implements WorkUserService {
                     case WorkAppMenuConstant.WORK_APP_MENU_CODE_USER_RESIDENTS_TO_BE_CERTIFIED:
                         resultDto = this.packageMenuData(childDto.getNavCode(), unauthorizedResult.getData());
                         break;
-                    case WorkAppMenuConstant.WORK_APP_MENU_CODE_MASTER_GROUP:
+//                    case WorkAppMenuConstant.WORK_APP_MENU_CODE_MASTER_GROUP:
-                        resultDto = this.packageMenuData(childDto.getNavCode(), masterMesCount.getData());
+//                        resultDto = this.packageMenuData(childDto.getNavCode(), masterMesCount.getData());
-                        break;
+//                        break;
                     default:
                         break;
                 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -36,7 +36,22 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <!-- 排除Tomcat依赖 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <!-- 添加 Undertow依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java

@@ -12,6 +12,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 党群议事模块

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -297,8 +297,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         IPage<ItemPendingHandleDTO> page = getPage(params);
         List<ItemPendingHandleDTO> list = baseDao.selectListOfPendingHandleItems(params);
-        Map<String, Long> map = listItemHandleDept();
+//        Map<String, Long> map = listItemHandleDept();
-        list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId())));
+//        list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId())));
         return new PageData<>(list, page.getTotal());
     }
 
@@ -3703,7 +3703,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         CityCaseDevelopDTO data = new CityCaseDevelopDTO();
         data.setId(entity.getId());
         data.setJjcd(CityPushEnum.JJCD_YB.getCode());
-        data.setSqly(CityPushEnum.SQLY_WLFS.getCode());
+        data.setSqly(CityPushEnum.SQLY_FXFS.getCode());
         data.setSqzt(CityPushStateEnum.DCL.getCode());
         data.setSbqs(CityPushEnum.SBQS_SB.getCode());
         data.setDqclhj(CityPushLinkEnum.DJ.getCode());
@@ -5942,26 +5942,26 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
-    public class DataReport {
+//    public class DataReport {
-        public void myRun(ItemHandleProcessDTO dto, String type) {
+//        public void myRun(ItemHandleProcessDTO dto, String type) {
-            new Thread(new Runnable() {
+//            new Thread(new Runnable() {
-                @SneakyThrows
+//                @SneakyThrows
-                @Override
+//                @Override
-                public void run() {
+//                public void run() {
-                    try {
+//                    try {
-                        Thread.sleep(131000);
+//                        Thread.sleep(131000);
-                        if ("1".equals(type)) {
+//                        if ("1".equals(type)) {
-                            pushToCityGridService.dispatchAudit(dto);//2.4  派遣审核
+//                            pushToCityGridService.dispatchAudit(dto);//2.4  派遣审核
-                        } else if ("2".equals(type)) {
+//                        } else if ("2".equals(type)) {
-                            pushToCityGridService.appealAudit(dto.getId(), NumConstant.ONE_STR);   // 诉求审核
+//                            pushToCityGridService.appealAudit(dto.getId(), NumConstant.ONE_STR);   // 诉求审核
-                        }
+//                        }
-                    } catch (Exception e) {
+//                    } catch (Exception e) {
-                        e.printStackTrace();
+//                        e.printStackTrace();
-                    }
+//                    }
-                }
+//                }
-            }).start();
+//            }).start();
-        }
+//        }
-    }
+//    }
 
     /**
      * 拉去项目在网格化平台的进展

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -1440,12 +1440,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             return;
         }
 
-        LambdaQueryWrapper<ItemHandleProcessEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue());
+//        LambdaQueryWrapper<ItemHandleProcessEntity> entityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>().eq(ItemHandleProcessEntity::getItemId,item.getItemId()).eq(ItemHandleProcessEntity::getState,ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_JS.getValue());
-        List<ItemHandleProcessEntity> list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper);
+//        List<ItemHandleProcessEntity> list = itemHandleProcessDao.selectList(entityLambdaQueryWrapper);
-
+//
-        if (list.size()>0){
+//        if (list.size()>0){
-            return;
+//            return;
-        }
+//        }
 
         ReceiveResultDTO dto = new ReceiveResultDTO();
         dto.setSqid(getSqid(item.getItemId()));

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml

@@ -20,6 +20,17 @@
 #    name: epdc-events-server
 server:
   port: @server.port@
+  undertow:
+    io-threads: 8
+    worker-threads: 64
+    buffer-size: 1024
+    direct-buffers: true
+    accesslog:
+      enabled: true
+      dir: logs
+      prefix: access_log.
+      suffix: log
+      pattern: "%h (%D ms) %T %l %u %t \"%r\" %s %b"
   servlet:
     context-path: /events
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -537,13 +537,7 @@
             WHEN 2 THEN '非常满意'
             ELSE ''
             END AS evaluationScore,
-            eve.APPROVE_NUM,
-            eve.OPPOSE_NUM,
-            eve.COMMENT_NUM,
-            eve.BROWSE_NUM,
             <if test="isRemind != null and isRemind != ''">
-                (case when (process.STATE = 1001 and HOUR( timediff( now(), item.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind,
-
                 (case when (getworkminute(item.CREATED_TIME,now()) / 60 > 6) then '红灯'
                 when (getworkminute(item.CREATED_TIME,now()) / 60 > 4 and getworkminute(item.CREATED_TIME,now()) / 60 &lt;=6) then '黄灯'
                 when (getworkminute(item.CREATED_TIME,now()) / 60 &lt;= 4) then '绿灯' else '' end) as lamp,
@@ -560,13 +554,9 @@
                         then concat((360 - getworkminute(item.CREATED_TIME,now())),'分钟')
                         else concat((6 - ROUND((getworkminute(item.CREATED_TIME,now()) / 60),1)),'小时') end)
                     end
-                ) as remainTime,
+                ) as remainTime
             </if>
-            ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum,
-            (case when d.ID is not null then '1' else '0' end) as isDelay
         FROM epdc_item item
-        LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0'
-        left join epdc_item_fusing_delay_record d on d.ITEM_ID  = item.ID and d.DEL_FLAG = '0'
         left join (
             select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state
             from epdc_item_handle_process b