1

doc/update1.3.2.sql

@@ -1,2 +1,5 @@
 ALTER TABLE `4dkankan_v4`.`t_agent_new_log`
-    ADD COLUMN `order_sn` varchar(255) NULL AFTER `total_time`;
+    ADD COLUMN `order_sn` varchar(255) NULL AFTER `total_time`;
+
+ALTER TABLE `4dkankan_v4`.`t_agent_authorize_modeling`
+    ADD COLUMN `camera_sn` varchar(255) NULL AFTER `authorize_key`;

src/main/java/com/fdkankan/agent/entity/AgentAuthorizeModeling.java

@@ -112,5 +112,6 @@ public class AgentAuthorizeModeling implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField("camera_sn")
+    private String cameraSn;
 }

src/main/java/com/fdkankan/agent/request/AuthModelingParam.java

@@ -15,4 +15,5 @@ public class AuthModelingParam {
     private Integer createAgentId;
     private String customerAccount;
     private String endCustomer;
+    private String cameraSn;
 }

src/main/java/com/fdkankan/agent/request/AuthorizeParam.java

@@ -32,4 +32,6 @@ public class AuthorizeParam extends RequestBase {
     private String snCode;
 
     private Integer agentId;
+
+    private String cameraSn;
 }

src/main/java/com/fdkankan/agent/service/impl/AgentAuthorizeModelingServiceImpl.java

@@ -61,6 +61,9 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
         if(StringUtils.isNotBlank(param.getAuthorizeKey())){
             wrapper.like(AgentAuthorizeModeling::getAuthorizeKey,param.getAuthorizeKey());
         }
+        if(StringUtils.isNotBlank(param.getCameraSn())){
+            wrapper.like(AgentAuthorizeModeling::getCameraSn,param.getCameraSn());
+        }
         List<AgentNew> agentNewList = agentNewService.getRecursionByAgentId(param.getAgentId());
         List<Integer> subAgentIds = agentNewList.stream().map(AgentNew::getId).collect(Collectors.toList());
         subAgentIds.add(param.getAgentId());
@@ -136,6 +139,7 @@ public class AgentAuthorizeModelingServiceImpl extends ServiceImpl<IAgentAuthori
                 entity.setAuthorizeStartTime(DateUtil.formatDate(param.getStartTime()));
                 entity.setAuthorizeEndTime(DateUtil.formatDate(param.getEndTime()));
             }
+            entity.setCameraSn(param.getCameraSn());
             entity.setCustomerName(param.getCustomerAccount());
             entity.setEndCustomer(param.getEndCustomer());
             entity.setAgentId(param.getAgentId());

src/main/java/com/fdkankan/agent/service/impl/ExcelServiceImpl.java

@@ -168,11 +168,12 @@ public class ExcelServiceImpl implements IExcelService {
             String customerAccount = map.get(0);
             String endCustomer = map.get(1);
             String authSn = map.get(2);
-            String distributorName = map.get(3);
-            String createDate = map.get(4);
-            String acitvated = map.get(5);
-            String activateDate = map.get(6);
-            String expirationDay = map.get(7);
+            String cameraSn = map.get(3);
+            String distributorName = map.get(4);
+            String createDate = map.get(5);
+            String acitvated = map.get(6);
+            String activateDate = map.get(7);
+            String expirationDay = map.get(8);
             if(StringUtils.isBlank(authSn) || StringUtils.isBlank(customerAccount) || StringUtils.isBlank(endCustomer) || StringUtils.isBlank(activateDate) || StringUtils.isBlank(expirationDay)){
                 log.info("数据错误:{}",map);
                 errorIndex.add(index);
@@ -213,6 +214,7 @@ public class ExcelServiceImpl implements IExcelService {
             param.setAuthCode(authSn);
             param.setCustomerAccount(customerAccount);
             param.setEndCustomer(endCustomer);
+            param.setCameraSn(cameraSn);
             params.add(param);
 
         }