修改登录验证逻辑

fbs_code/SpringTest/pom.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.example</groupId>
-    <artifactId>SpringTest</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.3.22</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-          <resource>
-              <directory>src/main/java</directory>
-              <includes>
-                  <include>**/*.properties</include>
-                  <include>**/*.xml</include>
-                  <include>**/*.txt</include>
-              </includes>
-              <filtering>true</filtering>
-          </resource>
-        </resources>
-    </build>
-</project>

fbs_code/SpringTest/src/main/java/com/test/Main.java

@@ -1,136 +0,0 @@
-package com.test;
-
-import org.springframework.core.io.ClassPathResource;
-
-import java.io.*;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-/**
- * @author Lenovo
- * @description Main
- * @date 2022/7/20 9:41
- */
-public class Main {
-       public static void main(String[] args)  {
-             /* ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("test.xml");
-
-              Student s1 = (Student)context.getBean("student");
-
-              System.out.println(s1);
-
-              context.close();*/
-
-              /*for(int i=1;i<=9;i++){
-                     String lineStr = "";
-                     for (int j=1;j<=i;j++){
-                            lineStr += (j+"*"+i+"="+i*j)+" ";
-                     }
-                     System.out.println(lineStr);
-              }*/
-
-             /* for(int i=100;i<1000;i++){
-                     int sum=0,a=i;
-                     while (a>0){
-                            int b = a % 10;
-                            sum += (int) Math.pow(b,3);
-                            a = a/10;
-                     }
-                     if(sum==i) System.out.println(i+"是水仙花数！");
-              }*/
-              List<Integer> list = new LinkedList<>();
-              list.add(1);
-              list.add(2);
-              list.add(3);
-              list.add(4);
-             /* Iterator iterator = list.iterator();
-              while (iterator.hasNext()){
-                     int i = (int) iterator.next();
-                     System.out.println(i);
-              }*/
-              list.forEach(i->{
-                     System.out.println(i);
-              });
-             /* ClassPathResource res = new ClassPathResource("test.txt");
-              try(InputStream fis = res.getInputStream()) {
-                  *//*   int tmp;
-                 while ((tmp = fis.read()) != -1){
-                        System.out.println((char)tmp);
-                 }*//*
-                     byte[] bs = new byte[fis.available()];
-                     int len = fis.read(bs);
-                     System.out.println(len);
-                     System.out.println(new String(bs));
-              }catch (IOException err){
-                     err.printStackTrace();
-              }*/
-              /*try(FileOutputStream fos = new FileOutputStream("SpringTest/src/output.txt",true)){
-                     fos.write("zhangwy@iwbnet.com".getBytes(StandardCharsets.UTF_8));
-                     fos.flush();
-              }catch (IOException err){
-                     err.printStackTrace();
-              }*/
-             /* try (FileOutputStream fos = new FileOutputStream("SpringTest/src/output.txt");
-                   InputStream fis = new FileInputStream("SpringTest/src/test.txt")){
-                     int tmp;
-                     byte[] bs = new byte[1024];
-                     while ((tmp = fis.read(bs)) != -1){
-                         fos.write(bs,0,tmp);
-                     }
-                     fos.flush();
-              }catch (IOException err){
-                     err.printStackTrace();
-              }*/
-             /* Object o1 = new Object();
-              Object o2 = new Object();
-              Thread thread1 = new Thread(()->{
-                     try {
-                            synchronized (o1){
-                                   Thread.sleep(1000);
-                                   synchronized(o2){
-                                          System.out.println(Thread.currentThread()+"线程1 执行！");
-                                   }
-                            }
-
-                     } catch (InterruptedException e) {
-                            e.printStackTrace();
-                     }
-              });
-              Thread thread2 = new Thread(() -> {
-                     try {
-                            synchronized (o2){
-                                   Thread.sleep(1000);
-                                   synchronized(o1){
-                                          System.out.println(Thread.currentThread()+"线程2 执行！");
-                                   }
-                            }
-
-                     } catch (InterruptedException e) {
-                            e.printStackTrace();
-                     }
-                    // System.out.println("this is 指示接口！");
-              });
-              thread1.start();
-              thread2.start();*/
-            /*  Timer timer = new Timer();
-              timer.schedule(new TimerTask() {
-                     @Override
-                     public void run() {
-                            System.out.println(Thread.currentThread()+" running!");
-
-                     }
-              },1000,1000);*/
-
-            Integer i = 10;
-
-            for (Type gen : i.getClass().getGenericInterfaces()){
-                   System.out.println(gen.getTypeName());
-            }
-              for (Class<?> clazz : i.getClass().getInterfaces()){
-                     System.out.println(clazz.getName());
-              }
-       }
-
-
-}

fbs_code/SpringTest/src/main/java/com/test/MyArrayList.java

@@ -1,25 +0,0 @@
-package com.test;
-
-/**
- * @author Lenovo
- * @description MyArrayList
- * @date 2022/7/25 12:47
- */
-public class MyArrayList<E> {
-
-    private Object[] arr = new Object[1];
-    private int size = 0;
-
-
-
-    public void add(E e,int index){
-        if(size>=arr.length){
-            Object[] arr = new Object[this.arr.length + 10];
-            for(int i=0;i<this.arr.length;i++) arr[i] = this.arr[i];
-            this.arr = arr;
-        }
-
-
-    }
-
-}

fbs_code/SpringTest/src/main/java/com/test/bean/Card.java

@@ -1,12 +0,0 @@
-package com.test.bean;
-
-/**
- * @author Lenovo
- * @description Card
- * @date 2022/7/20 10:02
- */
-public class Card {
-    public Card() {
-        System.out.println("card created...");
-    }
-}

fbs_code/SpringTest/src/main/java/com/test/bean/Student.java

@@ -1,18 +0,0 @@
-package com.test.bean;
-
-/**
- * @author Lenovo
- * @description Student
- * @date 2022/7/20 9:47
- */
-public class Student {
-    String name;
-    int id;
-
-    private void init(){
-        System.out.println("init...");
-    }
-    private void  destroy(){
-        System.out.println("destroy...");
-    }
-}

fbs_code/SpringTest/src/main/resources/test.txt

@@ -1 +0,0 @@
-jiangsu -- yancheng

fbs_code/SpringTest/src/main/resources/test.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        https://www.springframework.org/schema/beans/spring-beans.xsd">
-  <bean name="student" class="com.test.bean.Student" scope="singleton"
-        init-method="init" destroy-method="destroy" depends-on="card"></bean>
-  <bean name="card" class="com.test.bean.Card"></bean>
-</beans>

fbs_code/SpringTest/src/output.txt

@@ -1 +0,0 @@
-jiangsu -- yancheng11111111111111

fbs_code/SpringTest/src/test.txt

@@ -1 +0,0 @@
-jiangsu -- yancheng11111111111111

fbs_code/SpringTest/target/classes/test.txt

@@ -1 +0,0 @@
-jiangsu -- yancheng

fbs_code/SpringTest/target/classes/test.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        https://www.springframework.org/schema/beans/spring-beans.xsd">
-  <bean name="student" class="com.test.bean.Student" scope="singleton"
-        init-method="init" destroy-method="destroy" depends-on="card"></bean>
-  <bean name="card" class="com.test.bean.Card"></bean>
-</beans>

fbs_code/fbs-backend/fbs-mobile-service/src/main/java/com/yyjc/fbs/mobile/controller/OnlineDataCompanyController.java

@@ -21,8 +21,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
+
 import java.math.BigDecimal;
+import java.util.Optional;
+
+
 
 /**
  * @author Lenovo
@@ -40,21 +43,31 @@ public class OnlineDataCompanyController {
     @Autowired
     private ICompanyWarnStatisticsBiz iCompanyWarnStatisticsBiz;
 
-    @VerifySecurity
+   // @VerifySecurity
     @ApiOperation(value = "政府端/企业端-在线数据-实时数据-企业-企业概览-浓度超标次数统计图", consumes = "application/json", produces = "application/json", httpMethod = "POST")
     @RequestMapping(value = "/getOverWarnBar", consumes = "application/json", produces = "application/json", method = RequestMethod.POST)
     public ResponseVO<BarVO<Integer>> getOverWarnBar(@RequestBody OnlineDataQueryVO req) {
-        ExposeUser user = JSON.parseObject(threadLocal.get().getMsg(), ExposeUser.class);
-        Integer cid = 0;
-        if (user.getUser_type() == UserTypeEnum.company.getType()) {
-            cid = Integer.valueOf(user.getEnterprise_id());
-        } else {
-            if (StringUtils.isBlank(req.getId())) {
-                return new ResponseVO<>(ErrorCodeEnum.PARAMS_ERROR.getCode(), ErrorCodeEnum.PARAMS_ERROR.getMsg());
-            }
-            String str[] = req.getId().split("_");
-            cid = Integer.valueOf(str[1]);
+//        Optional<Result<Object>> objectResult = Optional.ofNullable(threadLocal.get());
+//        String msg =objectResult.isPresent()? objectResult.get().getMsg():null;
+//        ExposeUser user = null;
+//        if(StringUtils.isNotEmpty(msg)){
+//            user = JSON.parseObject(msg, ExposeUser.class);
+//        }
+//        Integer cid = 0;
+//        if (user!=null&&user.getUser_type() == UserTypeEnum.company.getType()) {
+//            cid = Integer.valueOf(user.getEnterprise_id());
+//        } else {
+//            if (StringUtils.isBlank(req.getId())) {
+//                return new ResponseVO<>(ErrorCodeEnum.PARAMS_ERROR.getCode(), ErrorCodeEnum.PARAMS_ERROR.getMsg());
+//            }
+//            String str[] = req.getId().split("_");
+//            cid = Integer.valueOf(str[1]);
+//        }
+        if (StringUtils.isBlank(req.getId())) {
+            return new ResponseVO<>(ErrorCodeEnum.PARAMS_ERROR.getCode(), ErrorCodeEnum.PARAMS_ERROR.getMsg());
         }
+        String str[] = req.getId().split("_");
+        Integer cid = Integer.valueOf(str[1]);
         CompanyWarnStatisticsDTO dto = new CompanyWarnStatisticsDTO();
         dto.setCompany_id(cid);
         dto.setQuery_start_date(req.getStart());
@@ -63,21 +76,31 @@ public class OnlineDataCompanyController {
         return new ResponseVO<BarVO<Integer>>(ErrorCodeEnum.SUCESS.getCode(), ErrorCodeEnum.SUCESS.getMsg(), bar);
     }
 
-    @VerifySecurity
+    //@VerifySecurity
     @ApiOperation(value = "政府端/企业端-在线数据-实时数据-企业-企业概览-排放企业排放总量趋势", consumes = "application/json", produces = "application/json", httpMethod = "POST")
     @RequestMapping(value = "/getCompanyEmissionsBar", consumes = "application/json", produces = "application/json", method = RequestMethod.POST)
     public ResponseVO<BarVO<BigDecimal>> getCompanyEmissionsBar(@RequestBody OnlineDataQueryVO req) {
-        ExposeUser user = JSON.parseObject(threadLocal.get().getMsg(), ExposeUser.class);
-        Integer cid = 0;
-        if (user.getUser_type() == UserTypeEnum.company.getType()) {
-            cid = Integer.valueOf(user.getEnterprise_id());
-        } else {
-            if (StringUtils.isBlank(req.getId())) {
-                return new ResponseVO<>(ErrorCodeEnum.PARAMS_ERROR.getCode(), ErrorCodeEnum.PARAMS_ERROR.getMsg());
-            }
-            String str[] = req.getId().split("_");
-            cid = Integer.valueOf(str[1]);
+//        Optional<Result<Object>> objectResult = Optional.ofNullable(threadLocal.get());
+//        String msg =objectResult.isPresent()? objectResult.get().getMsg():null;
+//        ExposeUser user = null;
+//        if(StringUtils.isNotEmpty(msg)){
+//            user = JSON.parseObject(msg, ExposeUser.class);
+//        }
+//        Integer cid = 0;
+//        if (user!=null&&user.getUser_type() == UserTypeEnum.company.getType()) {
+//            cid = Integer.valueOf(user.getEnterprise_id());
+//        } else {
+//            if (StringUtils.isBlank(req.getId())) {
+//                return new ResponseVO<>(ErrorCodeEnum.PARAMS_ERROR.getCode(), ErrorCodeEnum.PARAMS_ERROR.getMsg());
+//            }
+//            String str[] = req.getId().split("_");
+//            cid = Integer.valueOf(str[1]);
+//        }
+        if (StringUtils.isBlank(req.getId())) {
+            return new ResponseVO<>(ErrorCodeEnum.PARAMS_ERROR.getCode(), ErrorCodeEnum.PARAMS_ERROR.getMsg());
         }
+        String str[] = req.getId().split("_");
+        Integer cid = Integer.valueOf(str[1]);
         AnalDeviceRuntimeDTO dto = new AnalDeviceRuntimeDTO();
         dto.setCompany_id(cid);
         dto.setQuery_start_date(req.getStart());

fbs_code/fbs-backend/fbs-mobile-service/src/main/java/com/yyjc/fbs/mobile/controller/OnlineDataController.java

@@ -50,7 +50,7 @@ public class OnlineDataController {
     //private IMonitorBiz monitorBiz;
 
 
-    @VerifySecurity
+   // @VerifySecurity
     @ApiOperation(value = "政府/企业端-在线数据-实时数据-企业-报警-报警列表", consumes = "application/json", produces = "application/json", httpMethod = "POST")
     @RequestMapping(value = "/warnTable", consumes = "application/json", produces = "application/json", method = RequestMethod.POST)
     public PageResponseVO<WarnRespVO> warnTable(@RequestBody PageRequestVO<OnlineDataVO> queryVO) {
@@ -71,7 +71,7 @@ public class OnlineDataController {
 
     @ApiOperation(value = "政府/企业端-在线数据-实时数据-企业-设备档案-档案信息", consumes = "application/json", produces = "application/json", httpMethod = "POST")
     @RequestMapping(value = "/record", consumes = "application/json", produces = "application/json", method = RequestMethod.POST)
-    @VerifySecurity
+    //@VerifySecurity
     public ResponseVO<CompanyMonitorVO> getRecord(@RequestBody String id) {
         String str[] = id.split("_");
         String company_id = str[1];

fbs_code/fbs-backend/fbs-mobile-service/src/main/java/com/yyjc/fbs/mobile/controller/SysDictController.java

@@ -42,7 +42,7 @@ import java.util.List;
 @RequestMapping("/dict")
 @Api(tags = { "/mobile/dict/** | 公用接口" })
 @Slf4j
-public class SysDictController {
+public class    SysDictController {
     @Autowired
     private ISysDictionaryBiz sysDictionaryBiz;
     @Autowired
@@ -51,7 +51,7 @@ public class SysDictController {
     @Autowired
     ThreadLocal<Result<Object>> threadLocal;
 
-    @VerifySecurity
+   // @VerifySecurity
     @ApiOperation(value = "查询数据字典")
     @RequestMapping(value = "/getList", method = RequestMethod.GET)
     public ResponseVO<SysDictionaryVO> getList(String key, String code) {

fbs_code/fbs-backend/fbs-mobile-service/src/main/resources/config/application-dev.yml

@@ -3,6 +3,7 @@ app:
 apollo:
   #meta: http://192.168.0.103:8080
   meta: http://127.0.0.1:8180
+  #meta: http://192.168.0.81:8180
   bootstrap:
     enabled: true
     namespaces: ${namespace}

fbs_code/fbs-backend/fbs-plugin-security/src/main/java/com/yyjc/fbs/adapt/AuthSecurity.java

@@ -0,0 +1,10 @@
+package com.yyjc.fbs.adapt;
+
+import java.lang.annotation.*;
+
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface AuthSecurity {
+
+}

fbs_code/fbs-backend/fbs-plugin-security/src/main/java/com/yyjc/fbs/config/ProxyVerfiyAspect.java

@@ -5,6 +5,7 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yyjc.fbs.adapt.AuthSecurity;
 import com.yyjc.fbs.vo.Result;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -75,4 +76,40 @@ public class ProxyVerfiyAspect {
 			response.getWriter().print(JSON.toJSON(result));
 		}
 	}
+
+	//AOP拦截登录标有登录注解的方法
+	@Around("@annotation(authSecurity)")
+	public void authControl(ProceedingJoinPoint point, AuthSecurity authSecurity) throws Throwable {
+		ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder
+				.getRequestAttributes();
+		HttpServletRequest request = requestAttributes.getRequest();
+		HttpServletResponse response = requestAttributes.getResponse();
+		String uri = request.getRequestURI().toString();
+		if (log.isInfoEnabled())
+			log.info("[verify uri is]===" + uri);
+		response.setContentType("application/json;charset=UTF-8");
+		Cookie[] cookies = request.getCookies();
+		String token = request.getHeader(ConstantKey.TOKENHEADER);
+		if (StringUtils.isEmpty(token) && null != cookies) {
+			for (Cookie cookie : cookies) {
+				if (cookie.getName().equals(ConstantKey.TOKENHEADER) && !StringUtils.isEmpty(cookie.getValue())) {
+					token = ConstantKey.JWT_PREFIX + cookie.getValue();
+					break;
+				}
+			}
+		}
+		Result<Object> result = iSecurityServiceBiz.authUri(token, uri, request.getHeader("cid"));
+		if (log.isInfoEnabled())
+			log.info("[return result]===" + result != null ? result.getMsg() : "result is null");
+		threadLocal.set(result);
+		if (ErrorCodeMsgEnum.SUCESS.getCode() == result.getCode()) {
+			Object o = point.proceed();
+			if (o != null) {
+				response.getWriter().print(objectMapper.writeValueAsString(o));
+			}
+			threadLocal.remove();
+		} else {
+			response.getWriter().print(JSON.toJSON(result));
+		}
+	}
 }

fbs_code/fbs-backend/fbs-plugin-security/src/main/java/com/yyjc/fbs/feign/ISecurityServiceBiz.java

@@ -8,4 +8,9 @@ public interface ISecurityServiceBiz {
 	@PostMapping("/verifyUri")
     Result<Object> securityUri(@RequestHeader("Authorization") String token, @RequestHeader("uri") String securityUri,
                                @RequestHeader("cid") String cid);
+
+    //用户登录认证
+    @PostMapping("/authUri")
+    Result<Object> authUri(@RequestHeader("Authorization") String token, @RequestHeader("uri") String securityUri,
+                               @RequestHeader("cid") String cid);
 }

fbs_code/fbs-backend/fbs-security-common/src/main/java/com/yyjc/fbs/constant/ConstantKey.java

@@ -35,4 +35,8 @@ public interface ConstantKey {
 
 	int LOGIN_FAILED_COUNT_REFRESH_MILLSEC = 30 * 60 * 1000;
 	String[] NOFILTERURI = { "/login", "/error","/users/wxlogin" };
+
+    //仅仅用户登录
+	String USERLOGIN = "USER_LOGIN";
+
 }

fbs_code/fbs-backend/fbs-security-service/src/main/java/com/yyjc/fbs/config/UrlAccessDecisionManager.java

@@ -35,6 +35,10 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
 					log.error("[UrlAccessDecisionManager] method decide ===== user not login");
 				throw new BadCredentialsException("未登录");
 			}
+			//只校验用户登录，则直接放行 by zhangwy
+			if (ConstantKey.USERLOGIN.equals(needRole)) {
+				return;
+			}
 			// 如果有值就是模拟登陆
 			String company = ((FilterInvocation) o).getRequest().getHeader("company");
 			if (StringUtils.isNotBlank(company)) {

fbs_code/fbs-backend/fbs-security-service/src/main/java/com/yyjc/fbs/config/UrlFilterSecurity.java

@@ -32,6 +32,7 @@ public class UrlFilterSecurity implements FilterInvocationSecurityMetadataSource
 	ThreadLocal<String> threadLocal;
 
 	private final String VERFIYURI = "/verifyUri";
+	private final String AUTHURI = "/authUri";
 	private static final Logger log = LoggerFactory.getLogger(UrlFilterSecurity.class);
 
 	/**
@@ -53,6 +54,7 @@ public class UrlFilterSecurity implements FilterInvocationSecurityMetadataSource
 				log.info("[Auth Security uri is]" + requestUrl);
 		}
 		try {
+			//String requestUrl2 = ((FilterInvocation) o).getRequest().getHeader("uri");
 			Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 			if (authentication instanceof AnonymousAuthenticationToken) {
 				if (log.isInfoEnabled())
@@ -64,6 +66,13 @@ public class UrlFilterSecurity implements FilterInvocationSecurityMetadataSource
 					if (log.isInfoEnabled())
 						log.info("[Auth Security principal]" + JSONObject.toJSONString(principal));
 					threadLocal.set(JSONObject.toJSONString(principal));
+
+					//只进行登录校验
+					if (AUTHURI.equals(requestUrl)) {
+						return SecurityConfig.createList(ConstantKey.USERLOGIN);
+					}
+				}else if(AUTHURI.equals(requestUrl)){//如果没有获取到用户信息，则让用户进行登录
+					return SecurityConfig.createList(ConstantKey.ROLELOGIN);
 				}
 			}
 		} catch (Exception e) {

fbs_code/fbs-backend/fbs-security-service/src/main/java/com/yyjc/fbs/config/WebSecurityConfig.java

@@ -30,6 +30,7 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;

fbs_code/fbs-backend/fbs-security-service/src/main/java/com/yyjc/fbs/config/jwt/JWTLoginFilter.java

@@ -132,7 +132,6 @@ public class JWTLoginFilter extends UsernamePasswordAuthenticationFilter {
 			response.setContentType("application/json;charset=UTF-8");
 			
 			LoginResult result = getResult(auth.getName(), token, user);
-
 			//-----如果前端参数带有wxcode，说明用户需要保存openId  start-----
 			String wxCode = request.getParameter("wxcode");
 			if(StringUtils.isNotBlank(wxCode)){

fbs_code/fbs-backend/fbs-security-service/src/main/java/com/yyjc/fbs/controller/VerifyUri.java

@@ -46,6 +46,12 @@ public class VerifyUri extends BaseController {
 		return new Result<Object>(ErrorCodeMsgEnum.SUCESS.getCode(), threadLocal.get());
 	}
 
+	//用户登录校验请求
+	@RequestMapping(value = "/authUri")
+	public Result<Object> authUri() {
+		return new Result<Object>(ErrorCodeMsgEnum.SUCESS.getCode(), threadLocal.get());
+	}
+
 	@RequestMapping("/users/getCode")
 	@ApiOperation(value = "获得验证码", notes = "")
 	public void getCode(HttpServletRequest request, HttpServletResponse response) throws Exception {

fbs_code/fbs-backend/fbs-security-service/src/main/resources/application-dev.yml

@@ -3,6 +3,7 @@ app:
 apollo:
   #meta: http://192.168.0.103:8080
   meta: http://127.0.0.1:8180
+  #meta: http://192.168.0.81:8180
   bootstrap:
     enabled: true
     namespaces: ${namespace}

fbs_code/fbs-backend/fbs-server-lampblack/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,49 +1,49 @@
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\ErrorWriteDataExecutor.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\LoginExecutor.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\properties\MNServerProperties.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\properties\YouyanServerProperties.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\OnlineDataQueryVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\DataTypeEnum.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\provider\DetectorProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModusS2CCallDataSturct.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModbusFbpCodeC.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\FileUtil.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\impl\OnlineDataBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\DetectorMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\IDetectorBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\IOnlineDataBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\Swagger2Application.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\BootStrapConstants.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\controller\DetectorController.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\provider\OnlineDataProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\OnlinedataMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\ByteUtils.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\CemsServerApplication.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModusS2CLoginBackStruct.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dto\DetectorDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\RelayModeEnum.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\TreeMonitorUtil.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\ErrorEnum.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dto\CompanyDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\BengEnum.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\message\ModbusC2SCommonMessage.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\DataUtil.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\LampblackDataAll.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\impl\DetectorBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\manager\HeartbeatManager.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\WriteDataExecutor.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\KeyUtils.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\OrgMonitorUtil.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\controller\OnlineDataController.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\ElectricDataAll.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\OrgReqVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\manager\WebSocketServer.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModbusFileSturct.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModbusWriteSturct.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\config\SocketServerConfig.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\controller\OperationController.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModusS2CHeartBeatBackStruct.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\ModbusConstants.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\CallDataExecutor.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\ErrorCallDataExecutor.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\EnergyDataVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\provider\OnlineDataProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\manager\HeartbeatManager.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\properties\YouyanServerProperties.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\impl\DetectorBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\Swagger2Application.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\OnlineDataQueryVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\ErrorCallDataExecutor.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\OrgReqVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\controller\DetectorController.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\EnergyDataVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\TreeMonitorUtil.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\IOnlineDataBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModbusWriteSturct.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\controller\OperationController.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\ModbusConstants.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\ByteUtils.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\message\ModbusC2SCommonMessage.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModbusFbpCodeC.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\config\SocketServerConfig.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dto\DetectorDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\DetectorMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dto\CompanyDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\properties\MNServerProperties.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\impl\OnlineDataBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModusS2CHeartBeatBackStruct.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\controller\OnlineDataController.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\BengEnum.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\LoginExecutor.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\WriteDataExecutor.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModbusFileSturct.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModusS2CCallDataSturct.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\ErrorEnum.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\FileUtil.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\OnlinedataMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\ElectricDataAll.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\DataUtil.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\DataTypeEnum.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\BootStrapConstants.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\KeyUtils.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\OrgMonitorUtil.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\vo\LampblackDataAll.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\biz\IDetectorBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\dao\provider\DetectorProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\CemsServerApplication.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\utils\RelayModeEnum.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\ErrorWriteDataExecutor.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\manager\WebSocketServer.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\codec\ModusS2CLoginBackStruct.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-server-lampblack\src\main\java\com\yyjc\fbs\server\executors\CallDataExecutor.java

fbs_code/fbs-backend/fbs-statistic-service/src/main/java/com/yyjc/fbs/statistics/biz/impl/SootDataBizImpl.java

@@ -70,7 +70,7 @@ public class SootDataBizImpl implements ISootDataBiz {
 		monitorDTO.setType(MonitorTypeEnum.PURIFIER_CONDITION.getType());
 		List<Monitor> monitors = monitorMapper.selectList(monitorDTO);
 		CompanyDTO companyDTO = new CompanyDTO();
-		companyDTO.setMonitoring_type(ComMonitoringTypeEnum.ELECTRIC.getCode());
+		companyDTO.setMonitoring_type(ComMonitoringTypeEnum.LAMPBLACK.getCode());
 		List<Company> companies = companyMapper.selectList(companyDTO);
 		Map<Integer, String> companyMap = companies.stream()
 				.collect(Collectors.toMap(Company::getCompany_id, Company::getCatering_scale));

fbs_code/fbs-backend/fbs-statistic-service/target/generated-sources/annotations/com/yyjc/fbs/statistics/converter/WarnConverterImpl.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2023-02-27T15:42:47+0800",
+    date = "2023-04-24T18:30:53+0800",
     comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_321 (Oracle Corporation)"
 )
 @Component

fbs_code/fbs-backend/fbs-statistic-service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,99 +1,99 @@
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\WarnRespVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\MonitorDateBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\OnlineMonitorEventProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\MonitorRuntimeBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IPlanOperationBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\DeletePushEventXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyRedBlackXxljob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\PushEventProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\PushEventMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\OnlineComAndOrgBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\OrgReqVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnParamCleanMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyCreditXxljob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\RestRespVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyWarnStatisticMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\WarnCompanyXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\SootDataMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CleanRecordMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\SysDictionaryMapperProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\PushSettingsMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\CleanRecordDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\utils\DateUtil.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\OrganizationalMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\SampleXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\WarnDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\SootQueryVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\WriterDataVO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\UserMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\MonitorDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ISootDataBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ICompanyRedBlack.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\PlanOperationProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\AnalDeviceRuntimeDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnParamDischargeMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\CompanyProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\SootDataProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\config\XxlJobConfig.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\CleanRecordProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\MonitorOperationMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\AnalMonitorDateXxljob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\AnalMonitorDateMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnEarlyProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IMonitorRunTimeBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\CemsStatisticsApplication.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\PlanOperationMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\AbnormalDeclareProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\CompanyCreditBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\WarnParamDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\OrganizationalProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnParamDischargeProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\CompanyDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyRedBlackMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\PlanOperationDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\MonitorRunTimeXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ICompanyCreditBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\PlanOperationBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\MonitorOperationProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\OnlineMonitorEventDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\AnalDeviceRuntimeProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\WarnXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\AbnormalDeclareMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ICompanyBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\PushEventsBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\OnlineCompanyAndOrgXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\converter\WarnConverter.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IWarnBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IOnlineComAndOrgBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\config\SysParamConfig.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\MonitorProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\OnlineDataMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\AbnormalDeclareDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IPushEventsBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IWarnStatisticBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\UserForPush.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\SysDictionaryMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnEarlyMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\CompanyBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyOrgSootXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\MonitorMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\OnlineDataProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IMonitorStatusBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\OnlineMonitorEventMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyCreditMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\OnlineDataDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\WarnBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IMonitorDateBiz.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\WarnStatisticBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\SootDataBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\MonitorStatusBizImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\WarnEarlyDTO.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\AnalDeviceRuntimeMapper.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\CompanyRedBlackImpl.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnParamCleanProvider.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\MonitorStatusXxlJob.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\Swagger2Application.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\AnalDeviceRuntimeMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnEarlyMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\SootDataProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\AbnormalDeclareMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\config\SysParamConfig.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\OnlineDataProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\CompanyRedBlackImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\converter\WarnConverter.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyRedBlackMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IPushEventsBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\SootDataMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\WarnRespVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\MonitorOperationProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\UserMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\WarnBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\CompanyCreditBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\SootDataBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\config\XxlJobConfig.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ICompanyRedBlack.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\CompanyProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\WarnDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\MonitorDateBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\PlanOperationDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IWarnBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\MonitorStatusBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\PushEventProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\Swagger2Application.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnParamDischargeMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\MonitorProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\MonitorRuntimeBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyCreditXxljob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\PushSettingsMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\OnlineMonitorEventMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IMonitorStatusBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IWarnStatisticBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\MonitorDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\utils\DateUtil.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\UserForPush.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\MonitorStatusXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\WarnStatisticBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnParamCleanProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\CompanyBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IPlanOperationBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\WarnParamCleanMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\AnalDeviceRuntimeProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\PlanOperationMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\WarnParamDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\DeletePushEventXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\WarnEarlyDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\WarnCompanyXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\SootQueryVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\SysDictionaryMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\OrgReqVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\AbnormalDeclareProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IMonitorRunTimeBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\OnlineCompanyAndOrgXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyCreditMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyRedBlackXxljob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IMonitorDateBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\MonitorRunTimeXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CleanRecordMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\OnlineDataDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\AnalMonitorDateMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\CemsStatisticsApplication.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\MonitorMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ICompanyBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ISootDataBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\OnlineDataMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnParamDischargeProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\SysDictionaryMapperProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\PushEventMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\AnalDeviceRuntimeDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\CompanyWarnStatisticMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\OnlineMonitorEventProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\AbnormalDeclareDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\PlanOperationBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\CompanyDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\SampleXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\WarnXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\PlanOperationProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\WriterDataVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\OnlineComAndOrgBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\OnlineMonitorEventDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\impl\PushEventsBizImpl.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\MonitorOperationMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\IOnlineComAndOrgBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\vo\RestRespVO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dto\CleanRecordDTO.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\biz\ICompanyCreditBiz.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\OrganizationalProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\AnalMonitorDateXxljob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\CleanRecordProvider.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\OrganizationalMapper.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\jobhandler\CompanyOrgSootXxlJob.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\main\java\com\yyjc\fbs\statistics\dao\provider\WarnEarlyProvider.java

fbs_code/fbs-backend/fbs-statistic-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1,2 @@
+com\yyjc\fbs\statistics\test\DataFakerTest.class
+com\yyjc\fbs\statistics\test\CompanyWarnTest.class

fbs_code/fbs-backend/fbs-statistic-service/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,2 +1,2 @@
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\test\java\com\yyjc\fbs\statistics\test\DataFakerTest.java
-D:\iwb-workstation-2021\InternetOfThing\SourceCode\fbs-backend\fbs-statistic-service\src\test\java\com\yyjc\fbs\statistics\test\CompanyWarnTest.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\test\java\com\yyjc\fbs\statistics\test\CompanyWarnTest.java
+D:\Iwb-workstation-2022\youyan\fbs_code\fbs-backend\fbs-statistic-service\src\test\java\com\yyjc\fbs\statistics\test\DataFakerTest.java

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/biz/impl/DataPanelBizImpl.java

@@ -45,7 +45,7 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 		orgQuery.setIs_del(SysConstants.ISDEL_NO);
 		List<OrgRespVO> orgRespVOS = organizationalMapper.selectList(orgQuery);
 		CompanyDTO dto = new CompanyDTO();
-		dto.setMonitoring_type(ComMonitoringTypeEnum.ELECTRIC.getCode());
+		dto.setMonitoring_type(ComMonitoringTypeEnum.LAMPBLACK.getCode());
 		List<Company> companyList = companyMapper.selectList(dto);
 		List<Org> subOrgList = organizationalMapper.selectByParentId(org_id);
 		// 如果没有下属就是自身
@@ -76,7 +76,7 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 		orgQuery.setIs_del(SysConstants.ISDEL_NO);
 		List<OrgRespVO> orgRespVOS = organizationalMapper.selectList(orgQuery);
 		CompanyDTO dto = new CompanyDTO();
-		dto.setMonitoring_type(ComMonitoringTypeEnum.ELECTRIC.getCode());
+		dto.setMonitoring_type(ComMonitoringTypeEnum.LAMPBLACK.getCode());
 		List<Company> companyList = companyMapper.selectList(dto);
 		List<Org> subOrgList = organizationalMapper.selectByParentId(org_id);
 		// 如果没有下属就是自身
@@ -162,7 +162,7 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 		orgQuery.setIs_del(SysConstants.ISDEL_NO);
 		List<OrgRespVO> orgRespVOS = organizationalMapper.selectList(orgQuery);
 		CompanyDTO dto = new CompanyDTO();
-		dto.setMonitoring_type(ComMonitoringTypeEnum.ELECTRIC.getCode());
+		dto.setMonitoring_type(ComMonitoringTypeEnum.LAMPBLACK.getCode());
 		List<Company> companyList = companyMapper.selectList(dto);
 		List<Org> subOrgList = organizationalMapper.selectByParentId(org_id);
 		// 如果没有下属就是自身
@@ -237,7 +237,8 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 			if (companyIds.size() > 0) {
 				MonitorDTO monitorDTO = new MonitorDTO();
 				monitorDTO.setCompany_ids(companyIds);
-				monitorDTO.setType(MonitorTypeEnum.PURIFIER_CONDITION.getType());
+				monitorDTO.setType(MonitorTypeEnum.PURIFIER.getType());
+				monitorDTO.setType2(MonitorTypeEnum.FAN.getType());
 				List<Monitor> monitorList = monitorMapper.selectList(monitorDTO);
 				for (Monitor monitor : monitorList) {
 					CleanStausEnum dataEnum = CleanStausEnum.parse(monitor.getClean_status());
@@ -271,7 +272,9 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 			if (companyIds.size() > 0) {
 				MonitorDTO monitorDTO = new MonitorDTO();
 				monitorDTO.setCompany_ids(companyIds);
-				monitorDTO.setType(MonitorTypeEnum.PURIFIER_CONDITION.getType());
+				//monitorDTO.setType(MonitorTypeEnum.PURIFIER_CONDITION.getType());
+				monitorDTO.setType(MonitorTypeEnum.PURIFIER.getType());
+				monitorDTO.setType2(MonitorTypeEnum.FAN.getType());
 				List<Monitor> monitorList = monitorMapper.selectList(monitorDTO);
 				for (Monitor monitor : monitorList) {
 					if (monitor.getOnline() == DeviceStatusEnum.RUN.getCode()) {
@@ -345,7 +348,7 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 		orgQuery.setIs_del(SysConstants.ISDEL_NO);
 		List<OrgRespVO> orgRespVOS = organizationalMapper.selectList(orgQuery);
 		CompanyDTO dto = new CompanyDTO();
-		dto.setMonitoring_type(ComMonitoringTypeEnum.ELECTRIC.getCode());
+		dto.setMonitoring_type(ComMonitoringTypeEnum.LAMPBLACK.getCode());
 		List<Company> companyList = companyMapper.selectList(dto);
 		List<Integer> companyIds = OrgUtil.getCompanyIdsByOrgId(orgRespVOS, companyList, org_id);
 		OnlineDataPanel onlineDataPanel = new OnlineDataPanel();
@@ -355,15 +358,15 @@ public class DataPanelBizImpl implements IDataPanelBiz {
 			monitorDTO.setCompany_ids(companyIds);
 			List<Monitor> monitorList = monitorMapper.selectList(monitorDTO);
 			long terminal_total = monitorList.stream()
-					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER_CONDITION.getType()).count();
+					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER.getType() || a.getType()==MonitorTypeEnum.FAN.getType()).count();
 			long terminal_offline = monitorList.stream()
-					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER_CONDITION.getType())
+					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER.getType() || a.getType()==MonitorTypeEnum.FAN.getType())
 					.filter(a -> a.getOnline() == DeviceStatusEnum.ERROR.getCode()).count();
 			long run_total = monitorList.stream()
-					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER_CONDITION.getType())
+					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER.getType() || a.getType()==MonitorTypeEnum.FAN.getType())
 					.filter(a -> a.getOnline() == DeviceStatusEnum.RUN.getCode()).count();
 			long decommissioning_total = monitorList.stream()
-					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER_CONDITION.getType())
+					.filter(a -> a.getType() == MonitorTypeEnum.PURIFIER.getType() || a.getType()==MonitorTypeEnum.FAN.getType())
 					.filter(a -> a.getOnline() == DeviceStatusEnum.NORUN.getCode()).count();
 			long online_total = run_total + decommissioning_total;
 			BigDecimal line = new BigDecimal(terminal_total - terminal_offline);

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/controller/CommonQueryController.java

@@ -0,0 +1,63 @@
+package com.yyjc.fbs.sys.controller;
+
+import com.yyjc.fbs.constant.ErrorCodeEnum;
+import com.yyjc.fbs.constant.SysConstants;
+import com.yyjc.fbs.model.Company;
+import com.yyjc.fbs.sys.biz.ICompanyBiz;
+import com.yyjc.fbs.sys.biz.IOrganizationalBiz;
+import com.yyjc.fbs.sys.dto.CompanyDTO;
+import com.yyjc.fbs.sys.vo.OrgReqVO;
+import com.yyjc.fbs.vo.OrgRespVO;
+import com.yyjc.fbs.vo.ResponseVO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author zhangwy
+ * @description CommonQueryController
+ * @date 2023/4/23 10:30
+ */
+@RestController
+@RequestMapping("/query")
+public class CommonQueryController {
+    private static final Logger log = LoggerFactory.getLogger(CommonQueryController.class);
+
+    @Autowired
+    private IOrganizationalBiz organizationalBiz;
+    @Autowired
+    private ICompanyBiz companyBiz;
+
+    @RequestMapping(value = "/getOrg", consumes = "application/json", produces = "application/json", method =
+            RequestMethod.POST)
+    public ResponseVO<List<OrgRespVO>> getOrg() {
+        OrgReqVO dto = new OrgReqVO();
+        dto.setIs_del(SysConstants.ISDEL_NO);
+        List<OrgRespVO> orgRespVOS = organizationalBiz.selectList(dto);
+        return new ResponseVO<List<OrgRespVO>>(ErrorCodeEnum.SUCESS.getCode(), ErrorCodeEnum.SUCESS.getMsg(), orgRespVOS);
+    }
+
+    @RequestMapping(value = "/getCompany", consumes = "application/json", produces = "application/json", method =
+            RequestMethod.POST)
+    public ResponseVO<List<Company>> getCompany(@RequestBody CompanyDTO dto) {
+        if(dto ==null){
+            dto= new CompanyDTO();
+        }
+        dto.setIs_del(SysConstants.ISDEL_NO);
+        List<Company> companies = companyBiz.selectList(dto);
+        return new ResponseVO<List<Company>>(ErrorCodeEnum.SUCESS.getCode(), ErrorCodeEnum.SUCESS.getMsg(), companies);
+    }
+    @RequestMapping(value = "/getCompanyById/{cid}", consumes = "application/json", produces = "application/json",
+            method = RequestMethod.POST)
+    public ResponseVO<Company> getCompanyById(@PathVariable int cid) {
+        if(cid==0){
+            return new ResponseVO<>(ErrorCodeEnum.SUCESS.getCode(), ErrorCodeEnum.SUCESS.getMsg(), null);
+        }
+        Company company = companyBiz.selectById(cid);
+        return new ResponseVO<Company>(ErrorCodeEnum.SUCESS.getCode(), ErrorCodeEnum.SUCESS.getMsg(), company);
+    }
+
+}

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/controller/DataPanelController.java

@@ -1,6 +1,7 @@
 package com.yyjc.fbs.sys.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.yyjc.fbs.adapt.AuthSecurity;
 import com.yyjc.fbs.adapt.VerifySecurity;
 import com.yyjc.fbs.constant.ComMonitoringTypeEnum;
 import com.yyjc.fbs.constant.ErrorCodeEnum;
@@ -31,6 +32,15 @@ public class DataPanelController {
 	@Autowired
 	private ThreadLocal<Result<Object>> threadLocal;
 
+	@AuthSecurity
+	@GetMapping("/queryData2")
+	public ResponseVO<OnlineDataPanel> queryData2() {
+		ExposeUser user = JSON.parseObject(threadLocal.get().getMsg(), ExposeUser.class);
+		Integer org_id = Integer.valueOf(user.getEnterprise_id());
+		OnlineDataPanel onlineDataPanel = dataPanelBiz.queryData(org_id);
+		return new ResponseVO<>(ErrorCodeEnum.SUCESS.getCode(), ErrorCodeEnum.SUCESS.getMsg(), onlineDataPanel);
+	}
+
 	@VerifySecurity
 	@ApiOperation(value = "统计看板-企业总数,监测点信息", produces = "application/json", httpMethod = "GET")
 	@GetMapping("/queryData")
@@ -87,7 +97,7 @@ public class DataPanelController {
 	public ResponseVO<WarnCleanRespVO> getCleanCondition() {
 		ExposeUser user = JSON.parseObject(threadLocal.get().getMsg(), ExposeUser.class);
 		Integer org_id = Integer.valueOf(user.getEnterprise_id());
-		return dataBoardBiz.selectCleanCompany(ComMonitoringTypeEnum.ELECTRIC.getCode(), org_id);
+		return dataBoardBiz.selectCleanCompany(ComMonitoringTypeEnum.LAMPBLACK.getCode(), org_id);
 	}
 
 }

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/dao/provider/MonitorProvider.java

@@ -22,8 +22,14 @@ public class MonitorProvider {
 					if (monitor.getParent_id() != null) {
 						WHERE("parent_id = #{parent_id}");
 					}
+
 					if (monitor.getType() != null) {
-						WHERE("type = #{type}");
+						if(monitor.getType2() != null){
+							WHERE("type in (#{type},#{type2})");
+						}else{
+							WHERE("type = #{type}");
+						}
+
 					}
 					if (monitor.getDevice_manufacturer() != null) {
 						WHERE("device_manufacturer = #{device_manufacturer}");

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/dto/CompanyDTO.java

@@ -23,6 +23,7 @@ public class CompanyDTO {
 	@ApiModelProperty(value = "商户类型，000200000")
 	private String type;
 
+
 	@ApiModelProperty(value = "所属机构ids")
 	private List<Integer> company_ids;
 	@ApiModelProperty(value = "所属机构ids")

fbs_code/fbs-backend/fbs-sys-service/src/main/java/com/yyjc/fbs/sys/dto/MonitorDTO.java

@@ -12,6 +12,7 @@ public class MonitorDTO {
 	private Integer parent_id;
 	@ApiModelProperty(value = "0：净化设施；1：净化器；2：风机")
 	private Integer type;
+
 	@ApiModelProperty(value = "监测设备厂家，0：厂家1；1：大贞")
 	private Integer device_manufacturer;
 	@ApiModelProperty(value = "净化器清洁状态；1：清洁；2：较脏；3：太脏")
@@ -27,6 +28,17 @@ public class MonitorDTO {
 	private String is_order;
 	private Integer control;
 
+	// 添加设备类型查询条件 by zhangwy
+	private Integer type2;
+
+	public Integer getType2() {
+		return type2;
+	}
+
+	public void setType2(Integer type2) {
+		this.type2 = type2;
+	}
+
 	public Integer getControl() {
 		return control;
 	}

fbs_code/fbs-backend/fbs-sys-service/src/main/resources/config/application-dev.yml

@@ -3,6 +3,7 @@ app:
 apollo:
   #meta: http://192.168.0.103:8080
   meta: http://127.0.0.1:8180
+  #meta: http://192.168.0.81:8180
   bootstrap:
     enabled: true
     namespaces: ${namespace}

fbs_code/fbs-backend/pom.xml

@@ -24,6 +24,7 @@
 		<module>fbs-upload-service</module>
 		<module>fbs-app-service</module>
         <module>fbs-server-lampblack</module>
+        <module>fbs-mobile-service</module>
     </modules>
 
 	<!--<distributionManagement>

fbs_code/fbs-server-parent/fbs-hj212-server-bootstrap/src/main/java/com/yyjc/fbs/server/hj212/bootstrap/config/ServerConfig.java

@@ -43,7 +43,7 @@ public class ServerConfig
 	@Bean
 	public ICodec codec()
 	{
-		return new  Hj212FbpCodec();
+		return new Hj212FbpCodec();
 	}
 	
 	@Bean

fbs_code/fbs-server-parent/fbs-hj212-server-bootstrap/src/main/java/com/yyjc/fbs/server/hj212/bootstrap/utils/ListSplitter.java

@@ -15,6 +15,7 @@ public class ListSplitter implements Iterator<List<Message>> {
 		this.messages = messages;
 	}
 
+
 	@Override
 	public boolean hasNext() {
 		return currIndex < messages.size();

fbs_code/fbs-server-parent/fbs-plugin-redis/src/main/java/com/yyjc/fbs/plugin/redis/RedisAutoConfig.java

@@ -62,7 +62,7 @@ public class RedisAutoConfig
     }
     
     @Bean
-    public RedisSerializer<Object>defaultRedisSerializer(RedisTemplate<Object, Object> redisTemplate)
+    public RedisSerializer<Object>  defaultRedisSerializer(RedisTemplate<Object, Object> redisTemplate)
     {
     	Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<Object>(Object.class);
     	ObjectMapper om = new ObjectMapper();

fbs_code/fbs-server-parent/fbs-server-rpc/src/main/java/com/yyjc/fbs/server/rpc/Hj212FbpCodec.java

@@ -44,8 +44,10 @@ public class Hj212FbpCodec implements ICodec
 		{
 			return InvaildDataMessage.getInstance();
 		}
+		//读取##后面4位,表示包中数据段的长度
 		String data_length=input.readCharSequence(4, CharsetUtil.US_ASCII).toString();
 		int bodyLength = Integer.parseInt(data_length);
+		//  bytebuf后面可读长度如果小于数据段加上crc校验的4位加上包尾2位 ,抛出异常
 		if (input.readableBytes() < bodyLength + tailLength)
 		{
 			return NeedMoreByteMessage.getInstance();
@@ -60,6 +62,7 @@ public class Hj212FbpCodec implements ICodec
 		//check tail
 		byte[] tailBytes = new byte[2];
 		input.readBytes(tailBytes);
+
 		String tail = new String(tailBytes).toLowerCase();
 		if (!HJ212Constants.TAIL.equals(tail))
 		{

fbs_code/fbs-server-parent/fbs-server-socket/src/main/java/com/yyjc/fbs/server/socket/transport/ThreadFactory.java

@@ -12,4 +12,5 @@ public class ThreadFactory
 	
 	@Getter
 	private NioEventLoopGroup workerGroup;
+
 }