Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
b7d6ae452f

+ 1 - 1
dmp-business/dmp-rwd-version/src/main/java/com/persagy/dmp/rwd/demand/controller/DictionaryDemandController.java

@@ -170,7 +170,7 @@ public class DictionaryDemandController {
         QueryWrapper<DictionaryDemand> wrapper = new QueryWrapper<>();
         wrapper.eq("valid", ValidEnum.TRUE.getType());
         // 查询待回复和论证中
-        wrapper.in("bill_state", states);
+        wrapper.in("bill_state", (Object) states);
         ensureQueryCond(wrapper, cond);
         Page page = service.page(pageable, wrapper);
         return ResultHelper.multi(page.getRecords(), page.getTotal());

+ 2 - 4
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java

@@ -20,13 +20,11 @@ import com.persagy.dmp.common.utils.ResultHelper;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.entity.ObjectDigital;
-import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.mybatis.utils.ConditionUtil;
 import com.persagy.dmp.rwd.define.service.IObjectInfoService;
 import com.persagy.dmp.rwd.define.service.IObjectTypeService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -74,8 +72,8 @@ public class ObjectInfoController {
             Integer total = service.queryCount(wrapper);
             page.setTotal(total);
         } else {
-            // 20210819 临时处理,优化执行计划,解决Mysql:Out of sort memory问题
-            wrapper.select("/*+ SET_VAR(sort_buffer_size = 2M) */*");
+            /// 20210819 临时处理,优化执行计划,解决Mysql:Out of sort memory问题
+            // wrapper.select("/*+ SET_VAR(sort_buffer_size = 2M) */*");
             page = service.queryByCondition(QueryCriteriaHelper.toPage(criteria), wrapper);
         }
         return ResultHelper.multi(page.getRecords(), page.getTotal());

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/dao/EquipmentReportMapper.java

@@ -43,5 +43,5 @@ public interface EquipmentReportMapper {
      * @param equipmentId 设备ID
      * @return
      */
-    List<Map<String, Object>> queryComponentsCountByEquipId(@Param("groupCode") String groupCode,@Param("projectId") String projectId,@Param("equipmentId") String equipmentId);
+    List<Map<String, Object>> queryComponentsCountByEquipId(@Param("projectIds") List<String> projectIds,@Param("projectId") String projectId,@Param("equipmentId") String equipmentId);
 }

+ 6 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/simple/service/impl/EquipmentReportServiceImpl.java

@@ -87,7 +87,12 @@ public class EquipmentReportServiceImpl implements IEquipmentReportService {
      */
     @Override
     public List<Map<String, Object>> queryComponentsCountByEquipId(String equipmentId) {
-        return mapper.queryComponentsCountByEquipId(AppContext.getContext().getGroupCode(),AppContext.getContext().getProjectId(), equipmentId);
+        // 项目不为空,把平台级和集团级的加上
+        List<String> projectIds = new ArrayList<>();
+        projectIds.add(CommonConstant.DEFAULT_ID);
+        projectIds.add(AppContext.getContext().getGroupCode());
+        projectIds.add(AppContext.getContext().getProjectId());
+        return mapper.queryComponentsCountByEquipId(projectIds, AppContext.getContext().getProjectId(), equipmentId);
     }
 
 

+ 4 - 3
dmp-business/dmp-rwd/src/main/resources/mapper/EquipmentReportMapper.xml

@@ -98,15 +98,16 @@
         join dt_relation re on obj.id = re.obj_to
         join dt_define_type df on df.code = obj.class_code
         where obj.valid=TRUE and obj.obj_type='component' and re.rel_code='Eq2Ec'
+        and df.project_id in
+        <foreach collection="projectIds" item="projectId" open="(" close=")" separator="," >
+            #{projectId}
+        </foreach>
         <if test="null!=equipmentId and equipmentId.length>0">
             AND re.obj_from=#{equipmentId}
         </if>
         <if test="null!=projectId and projectId.length>0">
             AND obj.project_id=#{projectId}
         </if>
-        <if test="null!=groupCode and groupCode.length>0">
-            AND obj.group_code=#{groupCode}
-        </if>
         GROUP BY obj.class_code,re.obj_from,df.system_code,df.name
     </select>
 </mapper>

+ 3 - 2
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/basic/utils/QueryCriteriaHelper.java

@@ -37,12 +37,13 @@ public class QueryCriteriaHelper {
         }
         // 没有每页行数表示不分页
         if(criteria.getSize() == null || criteria.getSize() < 1) {
-            criteria.setSize(-1L);
+            // 20210923 为避免接口滥用引发内存溢出,限制返回条数
+            criteria.setSize(Long.MAX_VALUE);
         }
         Page<T> pageInfo = new Page<>();
         pageInfo.setCurrent(criteria.getPage());
         pageInfo.setSize(criteria.getSize());
-        // 20210819 size<-1时,拦截器不执行page的配置,因此改为在wrapper中排序
+        /// 20210819 size<-1时,拦截器不执行page的配置,因此改为在wrapper中排序
 //        pageInfo.setOrders(criteria.getOrders());
         pageInfo.setSearchCount(!criteria.isWithoutCount());
         return pageInfo;

+ 2 - 2
dmp-server/src/main/resources/logback-spring.xml

@@ -20,8 +20,8 @@
 
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
-              value="[${APP_NAME}:${ServerIP}:${ServerPort}] %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%level){blue} %clr(${PID}){magenta} %clr([%X{traceId}]){yellow} %clr([%thread]){orange} %clr(%logger){cyan} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
-    <property name="CONSOLE_LOG_PATTERN_NO_COLOR" value="[${APP_NAME}:${ServerIP}:${ServerPort}] %d{yyyy-MM-dd HH:mm:ss.SSS} %level ${PID} [%X{traceId}] [%thread] %logger %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
+              value="[${APP_NAME}:${ServerIP}:${ServerPort}] %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%level){blue} %clr(${PID}){magenta} %clr([%X{traceId}]){yellow} %clr([%thread]){orange} %clr(%logger{1}){cyan} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
+    <property name="CONSOLE_LOG_PATTERN_NO_COLOR" value="[${APP_NAME}:${ServerIP}:${ServerPort}] %d{yyyy-MM-dd HH:mm:ss.SSS} %level ${PID} [%X{traceId}] [%thread] %logger{1} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" />
 
     <!-- 控制台日志 -->
     <appender name="StdoutAppender" class="ch.qos.logback.core.ConsoleAppender">