撞配

src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java

@@ -73,7 +73,7 @@ public class IntegrateController {
         if (ObjectUtils.isEmpty(redis)) {
             List<SuperTableInfoDto> superTableInfos = superTableInfoMapper.findBySuperBomCode(selectorEntity.getSuperBomCode());
             List<RedisEntity> redisEntities = new ArrayList<>();
-            for (SuperTableInfoDto superTableInfo : superTableInfos) {
+            superTableInfos.forEach(superTableInfo->{
                 RedisEntity redisEntity = new RedisEntity();
                 redisEntity.setTableName(superTableInfo.getTableName());
                 redisEntity.setTableId(superTableInfo.getTableId());
@@ -115,7 +115,7 @@ public class IntegrateController {
                 redisEntity.setData(map);
                 redisEntities.add(redisEntity);
                 redisHelper.set(RedisKey.getVariantTableKey(selectorEntity.getSystem(), selectorEntity.getProductClassCode(), selectorEntity.getSuperBomCode()), JSONObject.toJSONString(redisEntities), 86400);
-            }
+            });
         }
 
         ConfigurableBom configurableBom = integrateService.getOdInfo(selectorEntity);

src/main/java/cn/com/uitech/authorization/mapper/SuperBomSkuInfoMapper.java

@@ -31,4 +31,5 @@ public interface SuperBomSkuInfoMapper extends IBaseMapper<SuperBomSkuInfo> {
 
     ArrayList<SuperBomSkuConfigInfo> getConfigInfos(String configId);
 
+    void updateSkuStatus(SuperBomSkuInfo returnSkuInfo);
 }

src/main/java/cn/com/uitech/authorization/pojo/dto/PLMResultDto.java

+package cn.com.uitech.authorization.pojo.dto;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class PLMResultDto implements Serializable{
+
+    private static final long serialVersionUID = -6753862215721540595L;
+
+    /**
+     * 状态：0：成功，1：失败。-1：缺少必须参数
+     */
+    private Integer code;
+
+
+    /**
+     *状态描述
+     */
+    private String message;
+
+    private Object data;
+
+
+
+
+
+}

src/main/java/cn/com/uitech/authorization/pojo/entity/SuperBomSkuInfo.java

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 import javax.persistence.Column;
 import javax.persistence.Table;
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -106,6 +107,11 @@ public class SuperBomSkuInfo  extends BasePageDto implements Serializable {
      */
     @Column(name = "description")
     private String description;
+    /**
+     * 特配描述
+     */
+    @Column(name = "description_bom")
+    private String descriptionBom;
 
     /**
      * cpqconfigid
@@ -136,6 +142,16 @@ public class SuperBomSkuInfo  extends BasePageDto implements Serializable {
      */
     @Column(name = "apply_status")
     private String applyStatus;
+    /**
+     * 已回号/未回号
+     */
+    @Column(name = "apply_user")
+    private String applyUser;
+    /**
+     * 已回号/未回号
+     */
+    @Column(name = "apply_time")
+    private Timestamp applyTime;
 
     /**
      * 集成来的

src/main/java/cn/com/uitech/authorization/service/SecurityService.java

@@ -38,9 +38,9 @@ public class SecurityService {
             SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority("Anonymous");
             simpleGrantedAuthorities.add(simpleGrantedAuthority);
 
-            return new UserImpl("Anonymous", "123456", simpleGrantedAuthorities
-                    ,0,"Anonymous"
-                    ,"Anonymous","","","");
+            return new UserImpl("system", "123456", simpleGrantedAuthorities
+                    ,0,"system"
+                    ,"system","","","");
         } else {
             String userCode = authentication.getName();
 

src/main/resources/mapper/SuperBomSkuInfoMapper.xml

@@ -25,6 +25,9 @@
         ,apply_status
         ,sku_code
         ,sku_name
+        ,apply_user
+        ,apply_time
+        ,description_bom
         ,id
     ) values (
         #{productClassCode},
@@ -48,6 +51,9 @@
         #{applyStatus},
         #{skuCode},
         #{skuName},
+        #{applyUser},
+        now(),
+        #{descriptionBom},
         #{id}
     )
     </insert>
@@ -113,6 +119,7 @@
             </if>
 
         </where>
+        order by a.apply_time desc
     </select>
 
     <update id="updateSkuInfo">
@@ -190,4 +197,8 @@
         h3c_v_Value
      from super_bom_sku_config_info where config_id  = #{configId}
     </select>
+
+<update id="updateSkuStatus">
+    update super_bom_sku_info set apply_status = '未回号' , apply_user = #{applyUser} , apply_time  = now() where config_id = #{configId}
+    </update>
 </mapper>
\ No newline at end of file