Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -60,6 +60,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.component.cache.enumeration.CacheType;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
@@ -590,7 +591,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Async
     public void processProtalData(String toke, String product, String appKey, ProtalDataRo protalData) {
         //巡检消息规则推送
-//    	protalRuleMessagePush(protalData);
+    	protalRuleMessagePush(protalData, toke, product, appKey);
     	if (!CollectionUtils.isEmpty(protalData.getPointInputitems())) {
             Long pointId = protalData.getId();
             List<Long> inputIds = Lists.newArrayList();
@@ -631,13 +632,15 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      * @param protalData
      */
     @Async
-    void protalRuleMessagePush(ProtalDataRo protalData){
+    void protalRuleMessagePush(ProtalDataRo protalData, String token, String product, String appKey){
         String bacthNo = UUID.randomUUID().toString();
         protalData.setBatchNo(bacthNo);
         protalData.setOriginalNodeState(protalData.getNodeState());
         protalData.setUserName(protalData.getCheckUser());
         protalData.setPointName(protalData.getName());
         try {
+        	RequestContext.setToken(token);
+        	RequestContext.setProduct(product);
 			ruleTrigger.publish(protalData, "风险管控/patrol", null);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ProtalDataRo.java

 package com.yeejoin.amos.fas.business.service.model;
-
+import java.util.Date;
 import java.util.List;
 
+import com.yeejoin.amos.fas.core.common.request.DateUtil;
+
 public class ProtalDataRo extends BasicsRo {
 
     private static final long serialVersionUID = -1029442967802232959L;
     
-    private Long id;
+    private Long id;//巡检点id
     private String name; //名称
     private String nodeState;//实时状态
     private String originalNodeState;//记录状态状态
@@ -47,9 +49,22 @@ public class ProtalDataRo extends BasicsRo {
     private String content;//内容
 
     private String pointName;//巡检点名称
+    
+    private String currTime;//当前时间
+
+    public String getCurrTime() {
+    	if (currTime == null)
+		{
+			return DateUtil.getDateTimeFormat(DateUtil.getNow());
+		}
+		return currTime;
+	}
 
+	public void setCurrTime(String currTime) {
+		this.currTime = currTime;
+	}
 
-    private List<CheckInputItemRo> items;
+	private List<CheckInputItemRo> items;
 
     private List<CheckInputItemRo> pointInputitems;
 

YeeAmosFireAutoSysStart/src/main/java/com/yeejoin/amos/YeeAmosFireAutoSysStart.java

@@ -26,6 +26,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.context.IotContext;
 import com.yeejoin.amos.filter.CrossDomainFilter;
@@ -43,7 +44,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
 @EnableHystrix
 @EnableScheduling
-@SpringBootApplication
+@SpringBootApplication(exclude={MybatisPlusAutoConfiguration.class})
 @EnableTransactionManagement
 @EnableConfigurationProperties
 @EnableSwagger2
@@ -53,10 +54,9 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableFeignClients
 @EnableAsync
 @EnableEurekaClient
-@ComponentScan({"org.typroject","com.yeejoin.amos"})
-@MapperScan(basePackages = { "com.yeejoin.amos.fas.business.dao.mapper" })
-public class YeeAmosFireAutoSysStart  implements ApplicationContextAware
-{
+@ComponentScan({ "org.typroject", "com.yeejoin.amos" })
+@MapperScan(basePackages = { "com.yeejoin.amos.fas.business.dao.mapper","org.typroject.tyboot.*.*.face.orm.dao","com.yeejoin.amos.api.*.face.orm.dao" })
+public class YeeAmosFireAutoSysStart implements ApplicationContextAware {
 
 	private static final Logger log = LoggerFactory.getLogger(YeeAmosFireAutoSysStart.class);
 
@@ -67,51 +67,44 @@ public class YeeAmosFireAutoSysStart  implements ApplicationContextAware
 	 * @throws IOException
 	 * @throws URISyntaxException
 	 */
-	public static void main(String[] args)
-	{
+	public static void main(String[] args) {
 		log.info("start Service..........");
-		try
-		{
+		try {
 			SpringApplication application = new SpringApplication(YeeAmosFireAutoSysStart.class);
 			Environment environment = application.run(args).getEnvironment();
-			log.info("SwaggerUI: 	http://localhost:"
-					+ environment.getProperty("server.port") + "/swagger-ui.html");
-		}
-		catch (Exception e)
-		{
+			log.info("SwaggerUI: 	http://localhost:" + environment.getProperty("server.port") + "/swagger-ui.html");
+		} catch (Exception e) {
 			System.out.println("error occur when run server! " + e);
 		}
 	}
-	
+
 	/**
-     * 获取并缓存上下文
-     */
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext)
-            throws BeansException {
-        // 缓存spring上下文
-        IotContext.getInstance().setApplicationContext(applicationContext);
-        RsDataQueue.getInstance().start();
-    }
-    
+	 * 获取并缓存上下文
+	 */
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		// 缓存spring上下文
+		IotContext.getInstance().setApplicationContext(applicationContext);
+		RsDataQueue.getInstance().start();
+	}
+
 	/**
 	 * 
 	 * <pre>
-	 *  跨域处理的FilterBean
+	 * 跨域处理的FilterBean
 	 * </pre>
 	 *
 	 * @return
 	 */
-	@Bean  
-	public FilterRegistrationBean crossFilterRegistrationBean()
-	{
+	@Bean
+	public FilterRegistrationBean crossFilterRegistrationBean() {
 		FilterRegistrationBean registrationBean = new FilterRegistrationBean();
 		CrossDomainFilter crossDomainFilter = new CrossDomainFilter();
 		registrationBean.setFilter(crossDomainFilter);
-//		List<String> urlPatterns = new ArrayList<String>();
-//		urlPatterns.add("/*");
-//		registrationBean.setUrlPatterns(urlPatterns);
-		registrationBean.setOrder(0);//值小的Filter先执行
+		// List<String> urlPatterns = new ArrayList<String>();
+		// urlPatterns.add("/*");
+		// registrationBean.setUrlPatterns(urlPatterns);
+		registrationBean.setOrder(0);// 值小的Filter先执行
 		return registrationBean;
 	}
 }
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -33,6 +33,9 @@ mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
 mybatis.configuration.mapUnderscoreToCamelCase=true
 logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
 
+spring.servlet.multipart.max-file-size=20MB
+spring.servlet.multipart.max-request-size=20MB
+
 #liquibase
 spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
 spring.liquibase.enabled= true

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -447,7 +447,14 @@
 		WHERE
 		DATEDIFF(t.begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(t.end_time,CURRENT_DATE) >= 0
 		AND (t.org_code like CONCAT(#{orgCode},'-%') OR t.org_code = #{orgCode}) 
-		GROUP BY d.status
+		AND d.status = 0
+		UNION ALL
+			select 
+				is_ok as type,count(1) as value 
+			from p_check a
+			where  (a.org_code like CONCAT(#{orgCode},'-%') OR a.org_code = #{orgCode})
+				and TO_DAYS(a.check_time) = TO_DAYS(CURRENT_DATE)
+			GROUP BY a.is_ok
 		]]>
 	</select>
 	
@@ -455,7 +462,7 @@
 		SELECT n.id,r.code,r.name as label,r.id as pointId,'risk' as type,n.create_date as changeDate
 		FROM f_rpn_change_log n
 		LEFT JOIN f_risk_source r ON r.id = n.risk_source_id
-		WHERE n.type = 1
+		WHERE n.type = 0
 		AND (r.org_code = #{org_code} OR r.org_code like CONCAT(#{org_code},'-%'))
 		ORDER BY n.create_date desc
 		limit 0,5