增加UAT配置

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 
@@ -23,6 +24,7 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/priceCoefficient")
 @Api(tags = "价格系数维护")
+@ApiIgnore
 public class BasicsPriceInfoController {
 
 

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -23,6 +24,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/brand")
 @Api(tags = {"品牌查询"})
+@ApiIgnore
 public class BrandController {
 
     @Resource

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

@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -29,6 +30,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/characteristic")
 @Api(tags = {"Characteristic 特征管理"})
+@ApiIgnore
 public class CharacteristicController {
 
     private static final Logger logger = LoggerFactory.getLogger(CharacteristicController.class);
@@ -41,7 +43,6 @@ public class CharacteristicController {
      * @param characteristicRequestParamDto
      * @return
      */
-    //@ApiIgnore
     @PostMapping("/getCharacteristic")
     @ApiOperation(value = "特征管理 列表", notes = "特征管理 分页列表", httpMethod = "POST")
     public CrmResponseEntity<PageInfo> getCharacteristic(@Validated({Query.class}) @RequestBody CharacteristicRequestParamDto characteristicRequestParamDto){
@@ -53,7 +54,6 @@ public class CharacteristicController {
      * @param characteristicRequestParamDto
      * @return
      */
-    //@ApiIgnore
     @PostMapping("/getCharacteristicByCode")
     @ApiOperation(value = "特征管理 查询详情", notes = "特征管理 查询详情", httpMethod = "POST")
     public CrmResponseEntity<Characteristic> getCharacteristicByCode(@RequestBody CharacteristicRequestParamDto characteristicRequestParamDto){
@@ -65,7 +65,6 @@ public class CharacteristicController {
      * @param characteristicRequestParamDto
      * @return
      */
-    //@ApiIgnore
     @PutMapping("/update")
     @ApiOperation(value = "特征管理 保存详情", notes = "特征管理 保存详情", httpMethod = "PUT")
     public CrmResponseEntity<Integer> updateCharacteristic(@Validated({EditSave.class}) @RequestBody CharacteristicRequestParamDto characteristicRequestParamDto){
@@ -80,7 +79,6 @@ public class CharacteristicController {
      * @param characteristicRequestParamDto
      * @return
      */
-    //@ApiIgnore
     @PutMapping("/updateVisitbleType")
     @ApiOperation(value = "特征管理 批量显示/隐藏特征数据", notes = "特征管理 批量显示/隐藏特征数据", httpMethod = "PUT", response = CrmResponseEntity.class)
     public CrmResponseEntity<Integer> updateVisibleType( @RequestBody CharacteristicRequestParamDto characteristicRequestParamDto){
@@ -94,7 +92,6 @@ public class CharacteristicController {
      * @param characteristicRequestParamDto
      * @return
      */
-    //@ApiIgnore
     @PostMapping("/getCharacteristicAll")
     @ApiOperation(value = "特征管理 查询所有征数据", notes = "特征管理 查询所有征数据", httpMethod = "POST", response = CrmResponseEntity.class)
     public CrmResponseEntity<List<Characteristic>> getCharacteristicAll(@RequestBody CharacteristicRequestParamDto characteristicRequestParamDto){

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,6 +34,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/characteristicValue")
 @Api(tags = {"CharacteristicValue 特征值管理"})
+@ApiIgnore
 public class CharacteristicValueController {
 
     private static final Logger logger = LoggerFactory.getLogger(CharacteristicValueController.class);
@@ -43,14 +45,12 @@ public class CharacteristicValueController {
     @Autowired
     private CtoBomService ctoBomService;
 
-    //@ApiIgnore
     @RequestMapping("/getCharacteristicValueList")
     @ApiOperation(value = "特征值管理 分页列表", notes = "特征值管理 分页列表", httpMethod = "POST")
     public CrmResponseEntity<PageInfo> getCharacteristicValueList( @RequestBody CharacteristicValueRequestParamDto dto){
         return ResultGenerator.genSuccessResult(characteristicValueService.getCharacteristicValueList(dto));
     }
 
-    //@ApiIgnore
     @PutMapping("/modifyBomStatusAll")
     @ApiOperation(value = "特征值管理 全部更新可卖状态", notes = "特征值管理 全部更新可卖状态", httpMethod = "PUT")
     public CrmResponseEntity<?> modifyBomStatusAll(@Validated({Query.class}) @RequestBody CharacteristicValueRequestParamDto dto) {
@@ -59,7 +59,6 @@ public class CharacteristicValueController {
         return ResultGenerator.genSuccessResult(characteristicValueService.modifyBomStatusAll(dto));
     }
 
-    //@ApiIgnore
     @PutMapping("/batchModifyBomStatus")
     @ApiOperation(value = "特征值管理 批量更新可卖状态", notes = "特征值管理 批量更新可卖状态", httpMethod = "PUT")
     public CrmResponseEntity<?> batchModifyBomStatus(@Validated({BathUpdate.class}) @RequestBody CharacteristicValueRequestParamDto dto) {
@@ -69,7 +68,6 @@ public class CharacteristicValueController {
 
     }
 
-    //@ApiIgnore
     @PutMapping("/editCharacteristicValue")
     @ApiOperation(value = "特征值管理 保存详情", notes = "特征值管理 保存详情", httpMethod = "PUT")
     public CrmResponseEntity<?> editCharacteristicValue(@Validated({EditSave.class}) @RequestBody CharacteristicValue dto) {
@@ -83,7 +81,6 @@ public class CharacteristicValueController {
      * @param componentCargoDto
      * @return 所有产品组名称
      */
-    //@ApiIgnore
     @PostMapping("/getUnitNames")
     @ApiOperation(value = "特征值管理 查询所有统一名称", notes = "特征值管理 查询所有统一名称", httpMethod = "POST")
     public CrmResponseEntity<List<ComponentCargoDto>> getR3NameAll(@RequestBody ComponentCargoDto componentCargoDto){
@@ -95,7 +92,6 @@ public class CharacteristicValueController {
      * @param characteristicValueRequestParamDto
      * @return 根据特征值查询详情
      */
-    //@ApiIgnore
     @PostMapping("/getCharacteristicValueByCode")
     @ApiOperation(value = "特征值管理 详情查询", notes = "特征值管理 详情查询", httpMethod = "POST")
     public CrmResponseEntity<CharacteristicValue> getCharacteristicValueByCode(@RequestBody CharacteristicValueRequestParamDto characteristicValueRequestParamDto){
@@ -107,7 +103,6 @@ public class CharacteristicValueController {
      * @param dto
      * @param response
      */
-    //@ApiIgnore
     @RequestMapping("/exportCharacteristicValue")
     @ApiOperation(value = "特征值管理 导出特征值", notes = "特征值管理 导出特征值", httpMethod = "POST")
     public void exportCharacteristicValue(@RequestBody CharacteristicValueRequestParamDto dto, HttpServletResponse response){
@@ -119,7 +114,6 @@ public class CharacteristicValueController {
      * @param file
      * @return
      */
-    //@ApiIgnore
     @RequestMapping("/batchUpdateByUpload")
     @ApiOperation(value = "特征值管理 上传文件更新", notes = "特征值管理 上传文件更新", httpMethod = "POST")
     public CrmResponseEntity<?> batchUpdateByUpload(@RequestParam("file") MultipartFile file){
@@ -132,7 +126,6 @@ public class CharacteristicValueController {
      * @param productGroupCode
      * @return
      */
-    //@ApiIgnore
     @RequestMapping("/exportCharacteristicValueAndOd")
     @ApiOperation(value = "询配询价 导出可用配置和OD关系表", notes = "询配询价 导出可用配置和OD关系表", httpMethod = "POST")
     public void exportCharacteristicValueAndOd(@RequestParam("bomCode") String bomCode,
@@ -148,7 +141,6 @@ public class CharacteristicValueController {
      * @param productGroupCode
      * @return
      */
-    //@ApiIgnore
     @RequestMapping("/getInquiryPrice")
     @ApiOperation(value = "询配询价查询配置按钮", notes = "询配询价查询配置按钮", httpMethod = "POST")
     public CrmResponseEntity<JSONObject> getInquiryPrice(@RequestParam("bomCode") String bomCode,

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -29,6 +30,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/config")
 @Api(tags = "选配器数据维护 controller")
+@ApiIgnore
 public class ConfigController {
 
     @Autowired

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -28,6 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/ctobom")
 @Api(tags = "CtoBom CTO物料维护")
+@ApiIgnore
 public class CtoBomController {
 
 
@@ -40,13 +42,18 @@ public class CtoBomController {
      * @param ctoBomRequestParamDto
      * @return
      */
-    //@ApiIgnore
     @PostMapping("/ctolist")
     @ApiOperation(value = "Cto物料 列表", notes = "Cto物料列表页", httpMethod = "POST")
-    public CrmResponseEntity<PageInfo> getCtoBoms(@RequestBody CtoBomRequestParamDto ctoBomRequestParamDto) {
+    public CrmResponseEntity<Object> getCtoBoms(@RequestBody CtoBomRequestParamDto ctoBomRequestParamDto) {
         return ResultGenerator.genSuccessResult(ctoBomService.getCtoBoms(ctoBomRequestParamDto));
     }
 
+    @PostMapping("/ctolistcpq")
+    @ApiOperation(value = "Cto物料 列表", notes = "Cto物料列表页", httpMethod = "POST")
+    public CrmResponseEntity<PageInfo> getCtoBom(@RequestBody CtoBomRequestParamDto ctoBomRequestParamDto) {
+        return ResultGenerator.genSuccessResult(ctoBomService.getCtoBom(ctoBomRequestParamDto));
+    }
+
     /**
      * 根据bomCode更新编辑好的cto物料
      *

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

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -23,6 +24,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -30,6 +32,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/integrate")
 @Api(tags = "integrate 集成接口")
+@ApiIgnore
 public class IntegrateController {
     @Autowired
     private IntegrateService integrateService;
@@ -37,6 +40,8 @@ public class IntegrateController {
     private SuperTableInfoMapper superTableInfoMapper;
     @Resource
     private RedisHelper redisHelper;
+    @Value("${selector.url}")
+    private String selectorUrl;
 
 
     @PostMapping("/setSuperBOMInfo")
@@ -145,7 +150,7 @@ public class IntegrateController {
         String responseBody = null;
         HttpHeaders headers = getHttpHeader();
         HttpEntity<String> requestEntity = new HttpEntity<String>(JSON.toJSONString(baseMap), headers);
-        ResponseEntity<String> responseEntity = restTemplate.exchange("http://127.0.0.1:8080/api/v1/selector/initialization", HttpMethod.POST, requestEntity, String.class);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(selectorUrl+"/initialization", HttpMethod.POST, requestEntity, String.class);
         JSONObject object = JSONObject.parseObject(responseEntity.getBody());
         Object data = object.get("data");
         if (!ObjectUtils.isEmpty(data)) {
@@ -267,7 +272,7 @@ public class IntegrateController {
         HttpHeaders headers = getHttpHeader();
         buildConfigurationInputDTO.setProductGroupCode(buildConfigurationInputDTO.getProductClassCode());
         HttpEntity<String> requestEntity = new HttpEntity<String>(JSON.toJSONString(buildConfigurationInputDTO), headers);
-        ResponseEntity<String> responseEntity = restTemplate.exchange("http://127.0.0.1:8080/api/v1/selector/buildConfiguration", HttpMethod.POST, requestEntity, String.class);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(selectorUrl+"/buildConfiguration", HttpMethod.POST, requestEntity, String.class);
         JSONObject object = JSONObject.parseObject(responseEntity.getBody());
         Map<String,Object> data = (Map<String, Object>) object.get("data");
         data.put("configId",String.valueOf(data.get("configId")));
@@ -283,7 +288,7 @@ public class IntegrateController {
         conflictAnalysisInputDTO.setProductGroupCode(conflictAnalysisInputDTO.getProductClassCode());
         conflictAnalysisInputDTO.setMaterialCode(conflictAnalysisInputDTO.getSuperBomCode());
         HttpEntity<String> requestEntity = new HttpEntity<String>(JSON.toJSONString(conflictAnalysisInputDTO), headers);
-        ResponseEntity<String> responseEntity = restTemplate.exchange("http://127.0.0.1:8080/api/v1/selector/conflictAnalysis", HttpMethod.POST, requestEntity, String.class);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(selectorUrl+"/conflictAnalysis", HttpMethod.POST, requestEntity, String.class);
         JSONObject object = JSONObject.parseObject(responseEntity.getBody());
         return ResultGenerator.genSuccessResult(object.get("data"));
     }
@@ -338,6 +343,11 @@ public class IntegrateController {
     public CrmResponseEntity<?> getToken(@RequestBody UserInfo userinfo) {
         return ResultGenerator.genSuccessResult(integrateService.getToken(userinfo));
     }
+    @PostMapping("/getUserDimension")
+    @ApiOperation(value = "获取用户权限", notes = "getUserDimension", httpMethod = "POST")
+    public CrmResponseEntity<?> getUserDimension(@RequestBody UserInfo userinfo) {
+        return ResultGenerator.genSuccessResult(integrateService.getUserDimension(userinfo));
+    }
 
 
 }

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * @author yangkuo
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/standardModelManage")
 @Api(tags = {"StandardModelManageDto 基准机型管理"})
+@ApiIgnore
 public class StandardModelManageController {
 
     @Autowired

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -25,6 +26,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/superBom")
 @Api(tags = {"部件产品价格系数维护"})
+@ApiIgnore
 public class SuperBomPriceCalculateController {
 
     @Resource

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 
@@ -24,6 +25,7 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/characterPriceInfo")
 @Api(tags = "部件价格系数维护")
+@ApiIgnore
 public class SuperCharacterPriceInfoController {
 
     @Resource

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

@@ -9,10 +9,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 @RestController
 @RequestMapping("/temp")
 @Api(tags = "temp 集成接口")
+@ApiIgnore
 public class TempController {
 
     @Autowired

src/main/java/cn/com/uitech/authorization/enums/AgreeNpEnum.java

-package cn.com.uitech.config.enums;
-
-import lombok.Getter;
-
-/**
- * @author yangkuo
- * @date 2020/5/30 21:08
- */
-public enum AgreeNpEnum {
-
-    /**
-     * 技术可行性回复状态-已回复
-     */
-    MANUAL_REPLIED("人工回复",0),
-
-    /**
-     * 技术可行性回复状态-未回复
-     */
-    AUTO_REPLIED("自动申请",1);
-
-
-    @Getter
-    private String desc;
-
-    @Getter
-    private Integer flage;
-
-    AgreeNpEnum(String desc, int flage){
-        this.flage=flage;
-        this.desc=desc;
-    }
-
-    public int getFlage(){
-        return flage;
-    }
-}

src/main/java/cn/com/uitech/authorization/enums/CtoTypeEnum.java

-package cn.com.uitech.authorization.enums;
-
-
-import lombok.Getter;
-
-/**
- * @author yangkuo
- * @date 2020/4/23 19:55
- * cto物料维护页面下拉
- */
-public enum CtoTypeEnum {
-
-    /**
-     * cto 类别
-     * Dynamic CTO
-     */
-    DYNAMIC_CTO("Dynamic CTO",1),
-
-    /**
-     * cto类别
-     * Fastpash
-     */
-    FASTPASH("Fastpash",0);
-
-    @Getter
-    private String desc;
-
-    @Getter
-    private Integer code;
-
-    CtoTypeEnum(String desc, int code) {
-        this.desc = desc;
-        this.code = code;
-    }
-}

src/main/java/cn/com/uitech/authorization/enums/ProductType.java

-package cn.com.uitech.authorization.enums;
-/**
- *产品类型
- *  @author xinsy
- *  @date 2020/5/11
- */
-
-import lombok.Getter;
-
-public enum ProductType implements SelectEnum {
-    /**
-     * 标配产品
-     */
-    STANDARD_PRODUCT("标配","1"),
-
-    /**
-     * 常规特配产品
-     */
-    CONFIGURABLE_PRODUCT("常规特配","2"),
-
-    /**
-     * 非常规特配产品
-     */
-    SPECIAL_CONFIG("非常规特配","3"),
-
-    /**
-     *  模糊产品
-     */
-    MISTY_PRODUCT("模糊产品","4"),
-
-    /**
-     *  Bundle产品
-     */
-    BUNDLE_PRODUCT("Bundle产品","5"),
-    /**
-     *  X86标配
-     */
-    X86_STANDARD_PRODUCT("X86标配","6"),
-    /**
-     *  SSCT
-     */
-    X86_CTO("SSCT","7"),
-    /**
-     *  X86XConfig
-     */
-    X86_XCONFIG("X86XConfig","8"),
-    /**
-     *  XCTO
-     */
-    XCTO("XCTO","9"),
-    /**
-     *  X86XConfig
-     */
-    XCONFIG("XConfig","10"),
-    /**
-     *   x86 uc mulit 统签多选产品
-     */
-    XCTOUC_MUILT("XMultiCTO","11"),
-    /**
-     *   预设Solution
-     */
-    SOLUTION("Solution","12");
-
-
-    @Getter
-    private String desc;
-    @Getter
-    private String code;
-
-    ProductType(String desc, String code) {
-        this.desc = desc;
-        this.code = code;
-    }
-}

src/main/java/cn/com/uitech/authorization/enums/UserDimensionEnum.java

-package cn.com.uitech.authorization.enums;
-
-import lombok.Getter;
-
-
-/**
- * 用户权限维度
- *
- * @authoro qiuxb
- * @date 2020/6/10
- */
-public enum UserDimensionEnum {
-
-    /**
-     * 产品组
-     */
-    PRODUCT_GROUP("产品组", "DC01"),
-
-    /**
-     * 管理分区
-     */
-    MANAGE_REGION("管理分区", "DC02"),
-
-    /**
-     * 客户处
-     */
-    INDUSTRY("客户处", "DC03"),
-
-    /**
-     * 审批级别
-     */
-    APPROVE_LEVEL("审批级别","DC04"),
-
-    /**
-     * 主行业
-     */
-    MAIN_TRADE("主行业", "DC11");
-
-    @Getter
-    private String desc;
-    @Getter
-    private String code;
-
-    UserDimensionEnum(String desc, String code) {
-        this.desc = desc;
-        this.code = code;
-    }
-}

src/main/java/cn/com/uitech/authorization/interger/ProductGroupApi.java

-package cn.com.uitech.authorization.interger;
-
-
-import cn.com.uitech.authorization.pojo.dto.ProductGroupApiDTO;
-import cn.com.uitech.authorization.utils.CrmResponseEntity;
-
-import java.util.List;
-
-/**
- * 产品分组
- */
-public interface ProductGroupApi {
-
-    /**
-     * 获取登录用户的产品分组下拉
-     * @return
-     */
-    public CrmResponseEntity<List<ProductGroupApiDTO>> getProductGroupTypeList();
-
-    /**
-     * 获取指定用户产品分组下拉
-     * @param itCode
-     * @return
-     */
-    public CrmResponseEntity<List<ProductGroupApiDTO>> getUserProductGroupTypeList(String itCode);
-
-    /**
-     * 获取所有产品组下拉数据
-     * @return
-     */
-    public CrmResponseEntity<List<ProductGroupApiDTO>> getAllProductGroupTypeList();
-
-}

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

-package cn.com.uitech.authorization.mapper;
-
-
-import cn.com.uitech.authorization.pojo.entity.BoSpecialBomProductInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author yangkuo
- * @date 2020/5/22 14:32
- */
-@Mapper
-public interface BOSpecialBOMProductInfoMapper extends IBaseMapper<BoSpecialBomProductInfo> {
-}

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

-package cn.com.uitech.authorization.mapper;
-
-import cn.com.uitech.authorization.pojo.dto.BoSpecialBOMProductApplyForMDto;
-import cn.com.uitech.authorization.pojo.entity.BoSpecialBomProductApply;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xinsy
- * @date 2020/5/21
- */
-@Mapper
-public interface BoSpecialBomProductApplyMapper extends IBaseMapper<BoSpecialBomProductApply> {
-
-    /**
-     * FP/NP F逻辑
-     * @param applyId
-     * @return
-     */
-    BoSpecialBomProductApply getSpecialBOMProductID(String applyId);
-
-    /**
-     * FP/NP F逻辑 更新非常规特配产品表
-     * @param mDto
-     * @return
-     */
-    Integer updateforM(BoSpecialBOMProductApplyForMDto mDto);
-
-    /**
-     * 根据产品id查找id
-     * @param applyId
-     * @return
-     */
-    Integer getApplyIdByProductId(String applyId);
-}

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

@@ -105,4 +105,6 @@ public interface CharacteristicValueMapper extends IBaseMapper<CharacteristicVal
     CharacteristicValue getCharacteristicValueInfoByCode(String h3cVCode, String h3cPn);
 
     void saveDeployPlm(SendDataToPlmLog log);
+
+    CharacteristicValue getCharacteristicValueInfoByCCode(String isH3cCode, String superBomCode);
 }

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

-package cn.com.uitech.authorization.mapper;
-
-import cn.com.uitech.authorization.pojo.dto.BoproductMTMDto;
-import cn.com.uitech.authorization.pojo.entity.MtmApply;
-import org.apache.ibatis.annotations.Mapper;
-import tk.mybatis.mapper.common.special.InsertUseGeneratedKeysMapper;
-
-/**
- * @author yangkuo
- * @date 2020/4/19 12:49
- * mtm号申请
- */
-@Mapper
-public interface MtmApplyMapper extends InsertUseGeneratedKeysMapper<MtmApply>, IBaseMapper<MtmApply> {
-
-
-    /**
-     * 根据ApplyID 修改，"M"逻辑
-     * @param dto
-     * @return 条数
-     */
-    Integer updateMTMApplyByApplyID(BoproductMTMDto dto);
-}

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

-package cn.com.uitech.authorization.mapper;
-
-import cn.com.uitech.authorization.pojo.entity.OdRelation;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.LinkedList;
-
-@Mapper
-public interface OdRelationMapper extends IBaseMapper<OdRelation> {
-
-
-    /**
-     * @desc 查询od关系
-     * @param bomCode
-     * @param productGroupCode
-     * @return
-     */
-    LinkedList<OdRelation> getOdRelationList(@Param("bomCode") String bomCode, @Param("productGroupCode") String productGroupCode);
-}

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

-package cn.com.uitech.authorization.mapper;
-
-import cn.com.uitech.authorization.pojo.dto.SpecialConfigInfoForMDto;
-import cn.com.uitech.authorization.pojo.entity.SpecialConfigInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author xinsy
- *
- *
- **/
-@Mapper
-public interface SpecialConfigInfoMapper extends IBaseMapper<SpecialConfigInfo> {
-
-    /**
-     * FP/NP F逻辑
-     */
-    String getAlreadyReplyName(String applyId);
-
-
-    Integer updateForM(SpecialConfigInfoForMDto specialConfigInfoForMDto);
-}

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

 package cn.com.uitech.authorization.mapper;
 
+import cn.com.uitech.authorization.pojo.entity.MenuInfo;
 import cn.com.uitech.authorization.pojo.entity.UserInfo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface UserInfoMapper extends IBaseMapper<UserInfo> {
     UserInfo getUser(UserInfo userinfo);
+
+    List<MenuInfo> getUserDimension(String userCode);
 }

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

-package cn.com.uitech.authorization.mapper;
-
-import cn.com.uitech.authorization.pojo.dto.BoproductMTMTransDto;
-import cn.com.uitech.authorization.pojo.entity.LmsSpecialWindchillHistory;
-import cn.com.uitech.authorization.pojo.entity.LmsWindchillApply;
-import cn.com.uitech.authorization.pojo.entity.LmsWindchillHistory;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface WindchillhistoryMapper {
-
-    Integer insertWindchillhistoryMapper(BoproductMTMTransDto boproductMTMTransDto);
-
-    LmsWindchillApply selectLmsWinchillLogByContractNumber(BoproductMTMTransDto dtos);
-
-    Integer insertLmsWindchillHistory(LmsWindchillHistory lmsWindchillHistory);
-
-    Integer insertLmsSpecialBomWindchillHistory(LmsSpecialWindchillHistory lmsWindchillHistory);
-}

src/main/java/cn/com/uitech/authorization/pojo/dto/BoSpecialBOMProductApplyForMDto.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 org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-
-/**
- * FP/NP M逻辑传参
- *
- * @author xinsy
- * @date 2020/05/21
- */
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-public class BoSpecialBOMProductApplyForMDto implements Serializable {
-
-    private static final long serialVersionUID = 5949798754481969387L;
-
-    private Integer BOMReplyState;
-
-    private Integer BOMReplyResult;
-
-    private String alreadyReplyName;
-
-    private Long specialBOMProductID;
-
-    private String comments;
-
-    private String PN;
-
-    private String newName;
-
-}

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

@@ -56,6 +56,7 @@ public class CtoBomRequestParamDto extends  BasePageDto implements Serializable{
 
     @ApiModelProperty(name = "plmName",value = "plm名称",dataType ="String")
     private String plmName;
+    private String token;
     private List<String> superBomCodes;
 
 

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

-package cn.com.uitech.authorization.pojo.dto;
-
-import cn.com.uitech.authorization.pojo.entity.PriceInfoDto;
-import cn.com.uitech.authorization.pojo.entity.ProductOdProductRelation;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-import java.util.List;
-
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-public class PriceAndOdInfoDTO extends PriceInfoDto {
-
-    private     Integer     odId;
-    private     String      name;
-    private     Integer     odType;
-    private     Integer     productType;
-    private     String      bomCode;
-    private     String      productGroupCode;
-    private     Integer     bindAmount;
-    private     String      description;
-    private     String      operator;
-    private     Date        operateDate;
-    private     Integer     odRelationType;
-    private     String      bundlingGroup;
-
-    private List<ProductOdProductRelation> relationlist;
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
-
-/**
- * @author yangkuo
- * @date 2020/4/26 16:23
- * 商机产品表
- */
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "boproductinfo")
-public class BoProductInfo implements Serializable{
-
-    private static final long serialVersionUID = -8617060720546239839L;
-
-    /**
-     * BOProjectID
-     */
-    private Integer boProjectId;
-    /**
-     * 产品ID
-     */
-    private Integer productId;
-    /**
-     * 商机ID
-     */
-    private Integer boId;
-    /**
-     * 项目方案ID
-     */
-   private Integer boProjectSolutionId;
-    /**
-     * 老BOM编号
-     */
-    private String OLDBOMCode;
-    /**
-     *
-     * 新BOM编号
-     */
-    private String  BOMCode;
-    /**
-     * 产品类型
-     */
-     private Integer ProductType;
-    /**
-     * 产品名
-     */
-    private String  ProductName;
-    /**
-     * 产品组编码
-     */
-    private String  ProductGroupCode;
-    /**
-     * 建议执行单价
-     */
-    private BigDecimal ExecuteUnitPrice;
-    /**
-     * 产品数量
-     */
-    private Integer ProductAmount;
-    /**
-     * 商机成本价
-     */
-    private BigDecimal CostPrice;
-    /**
-     * 销售成本价
-     */
-    private BigDecimal SalesCostPrice;
-    /**
-     * 成本支持价
-     */
-    private BigDecimal CostSupportPrice;
-    /**
-     * 严控价
-     */
-    private BigDecimal StrictControlPrice;
-    /**
-     * 客户经理价
-     */
-    private BigDecimal SalesPrice;
-    /**
-     * 代理价
-     */
-    private BigDecimal AgentPrice;
-    /**
-     * 基准机型配置价格
-     */
-    private BigDecimal BaseBOMPrice;
-    /**
-     * 当前配置价格
-     */
-    private BigDecimal CurrentBOMPrice;
-    /**
-     * 价格审批级别
-     */
-    private BigDecimal PriceApproveLevel;
-    /**
-     * 运营毛利率为0%的成本
-     */
-    private BigDecimal OperatingMargin;
-    /**
-     * 运营毛利率为14%的成本
-     */
-    private BigDecimal BMC;
-    /**
-     * PriceTeam价格
-     */
-    private BigDecimal PriceTeamPrice;
-    /**
-     * 审批后价格
-     */
-    private BigDecimal ApprovedPrice;
-    /**
-     * 是否有服务商费用
-     */
-    private Integer ServiceFeeFlag;
-    /**
-     * 捆绑类型,0：非捆绑产品,1：强制捆绑,2：按量捆绑
-     */
-    private Integer ProductBindType;
-    /**
-     * 捆绑原产品ID
-     */
-    private Integer SourceProductID;
-    /**
-     * 0：无需议价，1：Sales报价，2：报价提交审核
-     */
-    private Integer BargainStatus;
-    /**
-     * 0：无需申请，1：待申请，2：申请中，3：申请成功，4：申请失败
-     */
-    private Integer FastPathStatus;
-    /**
-     * 0：不需要，1：未反馈，2：可行，3：不可行
-     */
-    private Integer PreparationStepsResult;
-    /**
-     * Think产品服务
-     */
-    private String ThinkServiceName;
-    /**
-     * 销售状态
-     */
-    private Integer SalesStatus;
-    /**
-     * 时间戳
-     */
-    private Timestamp BOTimestamp;
-    /**
-     *
-     */
-    private Integer ODID;
-    /**
-     * CreatorDate
-     */
-    private Timestamp CreatorDate;
-    /**
-     * MainBindAmount（待确认）
-     */
-    private Integer  MainBindAmount;
-    /**
-     * ODBindAmount（待确认）
-     */
-    private Integer ODBindAmount;
-    /**
-     *  SourceID（代码确认逻辑）
-     */
-    private Integer SourceID;
-    /**
-     * ProductItemNum
-     */
-    private String ProductItemNum;
-    /**
-     * ProductDesc
-     * 库里类型text
-     */
-    private String ProductDesc;
-    /**
-     * ActualCostPrice
-     */
-    private BigDecimal ActualCostPrice;
-    /**
-     * GID
-     */
-    private String GID;
-    /**
-     * 大单备料流水号
-     */
-    private String StockNumber;
-    /**
-     * Price4XGP
-     */
-    private BigDecimal Price4XGP;
-    /**
-     * Price4XGPPercent
-     */
-    private BigDecimal Price4XGPPercent;
-    /**
-     * NetIncomePriceRMB
-     */
-    private BigDecimal NetIncomePriceRMB;
-    /**
-     * ActualGP
-     */
-    private BigDecimal  ActualGP;
-    /**
-     * ActualGPPercent
-     */
-    private BigDecimal ActualGPPercent;
-    /**
-     * 服务价格（待确认）
-     */
-    private BigDecimal ServicePrice;
-    /**
-     * 服务4X价格（待确认）
-     */
-    private BigDecimal Service4XPrice;
-    /**
-     * 服务标准成本（待确认）
-     */
-    private BigDecimal ServiceActualPrice;
-    /**
-     * 服务考核GD（待确认）
-     */
-    private BigDecimal Service4XGP;
-    /**
-     * 服务考核GP%（待确认）
-     */
-    private BigDecimal Service4XGPPercent;
-    /**
-     * 服务标准考核GD（待确认）
-     */
-    private BigDecimal ServiceActualGP;
-    /**
-     * 服务标准考核GD%（待确认）
-     */
-    private BigDecimal ServiceActualGPPercent;
-    /**
-     * 服务产出控制（待确认）
-     */
-    private String IsServiceOC;
-    /**
-     * ProductRemark
-     */
-    private String ProductRemark;
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
-/**
- * @author yangkuo
- * @date 2020/4/26 16:23
- */
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "bospecialbomproductapply")
-public class BoSpecialBomProductApply implements Serializable{
-
-    private static final long serialVersionUID = -2448598599641378125L;
-
-    /**
-     * 非常规特配申请ID
-     */
-    @Column(name = "specialBomProductId")
-    private Long specialBomProductId;
-    /**
-     * 非常规申请编号
-     */
-    @Column(name = "specialBomProductCode")
-    private String specialBomProductCode;
-    /**
-     * 基准机型BOMCode
-     */
-    @Column(name = "originalBomCode")
-    private String originalBomCode;
-    /**
-     * 原始产品名称
-     * 基准配置名称
-     */
-    @Column(name = "originalName")
-    private String originalName;
-
-    /**
-     * 申请的新名称
-     */
-    @Column(name = "newName")
-    private String  newName;
-    /**
-     * 原始机型信息
-     */
-    @Column(name = "oldName")
-    private String  oldName;
-    /**
-     * 非常规则特配描述
-     * 特殊配置描述信息
-     */
-    @Column(name = "specialDesc")
-    private String specialDesc;
-    /**
-     * 1:普通申请2:商台改名
-     * 申请类别
-     */
-    @Column(name = "specialType")
-    private Integer specialType;
-    /**
-     * 1：标配2：常规特配
-     * 基准机型配置类别
-     */
-    @Column(name = "baseBomType")
-    private Integer baseBomType;
-    /**
-     * 1:普通商机2:统签原则
-     */
-    @Column(name = "sourceType")
-    private Integer sourceType;
-    /**
-     * 申请人ITCode
-     */
-    @Column(name = "applyManCode")
-    private String applyManCode;
-    /**
-     * 申请人姓名
-     */
-    @Column(name = "applyManName")
-    private String applyManName;
-    /**
-     * 申请日期
-     */
-    @Column(name = "applyDate")
-    private Timestamp applyDate;
-    /**
-     * 供货可行性回复人ITCode
-     */
-    @Column(name = "availabilityReplyerCode")
-    private String  availabilityReplyerCode;
-    /**
-     * 供货可行性回复人姓名
-     */
-    @Column(name = "availabilityReplyerName")
-    private String  availabilityReplyerName;
-    /**
-     * 1：未回复2：已回复3：未提交
-     */
-    @Column(name = "availabilityReplyStatus")
-    private Integer availabilityReplyStatus;
-    /**
-     * 供应可行性回复时间
-     */
-    @Column(name = "availabilityReplyDate")
-    private Timestamp availabilityReplyDate;
-    /**
-     *供货可行性回复备注
-     */
-    @Column(name = "availabilityReplyRemark")
-    private String availabilityReplyRemark;
-    /**
-     * 1：可行 2：不可行 3：转技术可行4：未回复
-     */
-    @Column(name = "availabilityReplyResult")
-    private Integer availabilityReplyResult;
-    /**
-     * 技术可行性回复人ITCode
-     */
-    @Column(name = "feasibilityReplyerCode")
-    private String  feasibilityReplyerCode;
-    /**
-     * 技术可行性回复人姓名
-     */
-    @Column(name = "feasibilityReplyerName")
-    private String  feasibilityReplyerName;
-    /**
-     * 1：未回复2：已回复3：无需回复
-     */
-    @Column(name = "feasibilityReplyStatus")
-    private Integer feasibilityReplyStatus;
-    /**
-     * 技术可行性回复时间
-     */
-    @Column(name = "feasibilityReplyDate")
-    private Timestamp feasibilityReplyDate;
-    /**
-     * 技术可行性回复备注
-     */
-    @Column(name = "feasibilityReplyRemark")
-    private String  feasibilityReplyRemark;
-    /**
-     * 1：未回复2：已回复（价格可行性状态）
-     */
-    @Column(name = "feasibilityReplyResult")
-    private Integer feasibilityReplyResult;
-    /**
-     * 价格回复人ITCode
-     * 价格回复人
-     */
-    @Column(name = "priceReplyerCode")
-    private String priceReplyerCode;
-    /**
-     * 价格回复人姓名
-     */
-    @Column(name = "priceReplyerName")
-    private String priceReplyerName;
-    /**
-     * 1：未回复2：已回复
-     */
-    @Column(name = "priceReplyStatus")
-    private Integer priceReplyStatus;
-    /**
-     * 价格回复成本价
-     * 大客户总经理价
-     */
-    @Column(name = "replyCostPrice")
-    private BigDecimal replyCostPrice;
-    /**
-     * 价格回复代理价
-     */
-    @Column(name = "replyAgentPrice")
-    private BigDecimal replyAgentPrice;
-    /**
-     * 价格回复日期
-     */
-    @Column(name = "priceReplyDate")
-    private Timestamp priceReplyDate;
-    /**
-     * 价格回复备注
-     */
-    @Column(name = "priceResplyRemark")
-    private String priceResplyRemark;
-    /**
-     * BOM编号申请时间
-     */
-    @Column(name = "bomApplyDate")
-    private Timestamp bomApplyDate;
-    /**
-     * BOM编号申请人ITCode
-     */
-    @Column(name = "bomApplyManCode")
-    private String bomApplyManCode;
-    /**
-     * BOM编号申请人姓名
-     */
-    @Column(name = "bomApplyManName")
-    private String  bomApplyManName;
-    /**
-     * BOM编号回复人ITCode
-     */
-    @Column(name = "bomReplyerCode")
-    private String bomReplyerCode;
-    /**
-     * BOM编号回复人姓名
-     */
-    @Column(name = "bomReplyerName")
-    private String bomReplyerName;
-    /**
-     * 回复的物料编号
-     */
-    @Column(name = "replyBomCode")
-    private String replyBomCode;
-    /**
-     * 回复产品名称
-     */
-    @Column(name = "replyName")
-    private String replyName;
-    /**
-     * BOM编号回复日期
-     */
-    @Column(name = "bomReplyDate")
-    private Timestamp bomReplyDate;
-    /**
-     * BOM回复状态
-     */
-    @Column(name = "bomReplyState")
-    private Integer bomReplyState;
-    /**
-     * BOM回复结果是否可行
-     */
-    @Column(name = "bomReplyResult")
-    private Integer bomReplyResult;
-    /**
-     * 回复结果描述
-     */
-    @Column(name = "bomReplyResultDesc")
-    private String bomReplyResultDesc;
-    /**
-     * 显示器、主机等
-     */
-    @Column(name = "baseBomTypeId")
-    private Integer baseBOMTypeID;
-    /**
-     * 基准机型主机类型名称
-     * 是否主机
-     */
-    @Column(name = "baseBOMTypeName")
-    private String baseBOMTypeName;
-    /**
-     * 基准机配置价格
-     */
-    @Column(name = "baseStardConfigPrice")
-    private BigDecimal baseStardConfigPrice;
-    /**
-     * 基准机型商机成本价
-     * 大客户总经理价
-     */
-    @Column(name = "baseCostPrice")
-    private BigDecimal baseCostPrice;
-    /**
-     * 基准机型销售成本价
-     * 客户经理价
-     */
-    @Column(name = "baseSalesCostPrice")
-    private BigDecimal baseSalesCostPrice;
-    /**
-     * 基准机型成本支持价
-     * 行业总监价
-     */
-    @Column(name = "baseCostSupportPrice")
-    private BigDecimal baseCostSupportPrice;
-    /**
-     * 基准机型严控价
-     * 分区总经理价
-     */
-    @Column(name = "baseStrictControlPrice")
-    private BigDecimal baseStrictControlPrice;
-    /**
-     * 基准机型客户经理价
-     * 分区总监价
-     */
-    @Column(name = "baseSalesPrice")
-    private BigDecimal baseSalesPrice;
-    /**
-     * 基准机型代理价
-     * 代理价
-     */
-    @Column(name = "baseAgentPrice")
-    private BigDecimal baseAgentPrice;
-    /**
-     * 工厂名称
-     */
-    @Column(name = "factoryName")
-    private String factoryName;
-    /**
-     * 是否转为常规特配
-     */
-    @Column(name = "isTurnSpecial")
-    private String isTurnSpecial;
-    /**
-     * 非常规物料编号申请流程
-     */
-    @Column(name = "processType")
-    private Integer  processType;
-    /**
-     * 商台更名申请合同单号
-     */
-    @Column(name = "contractNumber")
-    private String contractNumber;
-    /**
-     * 价格回复结果
-     */
-    @Column(name = "priceReplyResult")
-    private Integer priceReplyResult;
-    /**
-     * 物料编号申请备注
-     */
-    @Column(name = "boMapplyRemark")
-    private String boMapplyRemark;
-    /**
-     * 是否同意NP  1 同意  0 不同意
-     */
-    @Column(name = "agreeNp")
-    private Integer agreeNp;
-    /**
-     * 真实成本
-     * 标准成本参考价
-     * 标准成本价
-     */
-    @Column(name = "actualCostPrice")
-    private BigDecimal actualCostPrice;
-    /**
-     * SpcialApplyType
-     */
-    @Column(name = "spcialApplyType")
-    private Integer spcialApplyType;
-    /**
-     * GID
-     */
-    @Column(name = "gId")
-    private String gId;
-
-
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-
-import io.swagger.annotations.ApiModel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author yangkuo
- * @date 2020/5/22 14:28
- */
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "bospecialbomproductinfo")
-@ApiModel(value = "BoSpecialBomProductInfo",description = "非常规和立项产品mapping，实体")
-public class BoSpecialBomProductInfo implements Serializable{
-
-    private static final long serialVersionUID = -6525534393397908386L;
-
-    /**
-     * 产品id
-     */
-    @Column(name = "productId")
-    private Integer productId;
-    /**
-     * 非常规特配申请id
-     */
-    @Column(name = "specialBomProductId")
-    private Integer specialBomProductId;
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Zhaoxl
- */
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "a_bomtype")
-public class BomType implements Serializable {
-
-    private     Integer     bomTypeId;
-    private     String      productGroupCode;
-    private     String      bomTypeName;
-    private     Integer     status;
-
-}

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

+package cn.com.uitech.authorization.pojo.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@ToString
+@Table(name = "menu_info")
+@Builder
+@ApiModel("menu_info")
+public class MenuInfo {
+    @Column(name = "menu_id")
+    private Integer menuId;
+    @Column(name = "menu_name")
+    private String menuName;
+    @Column(name = "menu_url")
+    private String menuUrl;
+    @Column(name = "is_state")
+    private Integer isState;
+    @Column(name = "menu_code")
+    private String menuCode;
+    @Transient
+    private String userCode;
+}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-
-/**
- * @author yangkuo
- * @date 2020/4/19 12:49
- * mtm号申请 实体类
- */
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "mtmapply")
-public class MtmApply implements Serializable{
-
-    private static final long serialVersionUID = 6208474694752924328L;
-
-    /**
-     * mtm 申请单号
-     */
-    @Id
-    @Column(name = "applyid")
-    private Integer applyId;
-    /**
-     * cto物料编号
-     */
-    @Column(name = "bomcode")
-    private String  bomCode;
-    /**
-     * 产品组编码
-     */
-    @Column(name = "productgroupcode")
-    private String  productGroupCode;
-    /**
-     * 返回物料号
-     */
-    @Column(name = "mtmnumber")
-    private String  mtmNumber;
-    /**
-     * 申请人ITCode
-     */
-    @Column(name = "applymancode")
-    private String  applyManCode;
-    /**
-     * 申请日期
-     */
-    @Column(name = "applydate")
-    private Timestamp applyDate;
-    /**
-     * 申请描述
-     */
-    @Column(name = "applydesc")
-    private String  applyDesc;
-
-    /**
-     * mtm号申请状态
-     * 1申请中
-     * 4以回复
-     */
-    @Column(name = "salesstatus")
-    private Integer salesStatus;
-    /**
-     * 申请类型
-     */
-    @Column(name = "applytype")
-    private Integer applyType;
-    /**
-     * MTM名称
-     * 申请产品名称
-     */
-    @Column(name = "mtmname")
-    private String  mtmName;
-    /**
-     * 回复名称
-     */
-    @Column(name = "replymtmname")
-    private String  replyMtmName;
-    /**
-     * 申请新的MTM号
-     */
-    @Column(name = "applynewmtm")
-    private Integer applyNewMTM;
-    /**
-     * CTO类型
-     */
-    @Column(name = "ctotype")
-    private Integer ctoType;
-
-    /**
-     * MTM的配置id
-     */
-    @Column(name = "configid")
-    private Long configId;
-}
-

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Table;
-import java.math.BigDecimal;
-
-/**
- * @author zhaoxl
- * @ClassName Price
- * @createDate 2020/4/24 11:04
- * @updateDate 2020/4/24 11:04
- **/
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "price")
-public class Price {
-
-    /**
-     * 价格ID
-     */
-    private Integer priceId;
-    /**
-     * 客户经理价调整价 --> 客户经理价 调整价
-     */
-    private BigDecimal saleCostPrice;
-    /**
-     * 行业总监价  -->  行业总监价 调整价
-     */
-    private BigDecimal costSupportPrice;
-    /**
-     * 分区总经理价  -->  分区总经理价 调整价
-     */
-    private BigDecimal strictControlPrice;
-    /**
-     * 分区总监价  --> 分区总监价 调整价
-     */
-    private BigDecimal salesManagerPrice;
-    /**
-     * 是否一口价
-     */
-    private Integer isConfirmPrice;
-    /**
-     * 一口价价格
-     */
-    private BigDecimal confirmPrice;
-    /**
-     * 商机的撇值
-     */
-    private BigDecimal boCostPriceP;
-    /**
-     * 代理撇值
-     */
-    private BigDecimal agentPriceP;
-    /**
-     * Code
-     */
-    private String code;
-    /**
-     * 产品组
-     */
-    private String pgCode;
-
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.math.BigDecimal;
-
-/**
- * @author zhaoxl
- * @ClassName Price
- * @createDate 2020/4/24 11:04
- * @updateDate 2020/4/24 11:04
- **/
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "pricecalexpression")
-public class Pricecalexpression {
-
-    /**
-     * 产品HierarchyID
-     */
-    @Column(name = "phid")
-    private Integer phId;
-    /**
-     * 1：标配，2：常规特配
-     */
-    @Column(name = "producttype")
-    private Integer productType;
-    /**
-     * 1：产品组，2：产品层次，3：BOM
-     */
-    @Column(name = "expressiontype")
-    private Integer expressionType;
-    /**
-     * BOM编码
-     */
-    @Column(name = "bomcode")
-    private String bomCode;
-    /**
-     * 产品组编码
-     */
-    @Column(name = "productgroupcode")
-    private String productGroupCode;
-    /**
-     * 0：成本定价法，1：市场定价法
-     */
-    @Column(name = "pricetype")
-    private Integer priceType;
-    /**
-     * 销售成本价调整系数  --》行业总监价调整系数
-     */
-    @Column(name = "salecostadjustmod")
-    private BigDecimal saleCostAdjustMod;
-    /**
-     * 销售成本价调整值
-     */
-    @Column(name = "salecostadjustnum")
-    private BigDecimal saleCostAdjustNum;
-    /**
-     * 成本支持价调整系数
-     */
-    @Column(name = "costsupportmod")
-    private BigDecimal costSupportMod;
-    /**
-     * 成本支持价调整值
-     */
-    @Column(name = "costsupportnum")
-    private BigDecimal costSupportNum;
-    /**
-     * 严控价调整系数
-     */
-    @Column(name = "strictcontrolmod")
-    private BigDecimal strictControlMod;
-    /**
-     * 严控价调整值
-     */
-    @Column(name = "strictcontrolnum")
-    private BigDecimal strictControlNum;
-    /**
-     * 客户经理价调整系数
-     */
-    @Column(name = "salesmanagermod")
-    private BigDecimal salesManagerMod;
-    /**
-     * 客户经理价调整值
-     */
-    @Column(name = "salesmanagernum")
-    private BigDecimal salesManagerNum;
-
-    @Transient
-    /**
-     * 是否一口价   0是  1否
-     */
-    private Integer isConfirmPrice;
-    /**
-     * 客户经理价调整价 --> 客户经理价 调整价
-     */
-    @Transient
-    private BigDecimal saleCostPrice;
-    /**
-     * 行业总监价  -->  行业总监价 调整价
-     */
-    @Transient
-    private BigDecimal costSupportPrice;
-    /**
-     * 分区总经理价  -->  分区总经理价 调整价
-     */
-    @Transient
-    private BigDecimal strictControlPrice;
-    /**
-     * 分区总监价  --> 分区总监价 调整价
-     */
-    @Transient
-    private BigDecimal salesManagerPrice;
-    @Transient
-    private BigDecimal agentPrice;
-    @Transient
-    private BigDecimal boCostPrice;
-    @Transient
-    private BigDecimal actualCostPrice;
-    @Transient
-    private Integer priceId;
-    @Transient
-    private Integer priceIdV;
-    @Transient
-    private String characteristicValueCode;
-    @Transient
-    private Integer bomTypeId;
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import lombok.*;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.io.Serializable;
-
-/**
- * @author zhaoxl
- * @createDate 2020/4/10 16:56
- * @updateDate 2020/4/10 16:56
- **/
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-@Table(name = "odproductrelation")
-public class ProductOdProductRelation implements Serializable {
-
-    private     Integer    odId;
-    private     Integer    productType;
-    private     String     bomCode;
-    private     Integer    bindAmount;
-    private     String     productGroupCode;
-
-    private     Integer     priceId;
-
-    @Transient
-    private     String     name;
-
-}

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

-package cn.com.uitech.authorization.pojo.entity;
-
-import io.swagger.annotations.ApiModel;
-import lombok.*;
-import lombok.experimental.Accessors;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- *
- * @author xinsy
- */
-
-@Table(name = "specialconfiginfo")
-@Accessors(chain = true)
-@NoArgsConstructor
-@Getter
-@Setter
-@ToString
-public class SpecialConfigInfo implements Serializable {
-
-    private static final long serialVersionUID = 6853534145975727633L;
-
-    @Column(name = "specialapplybomid")
-    private Long specialApplyBomId;
-
-    @Column(name = "boproductid")
-    private Integer boProductId;
-
-    @Column(name = "specialBomProductCode")
-    private String specialBomProductCode;
-
-    @Column(name = "bomstate")
-    private Integer bomState;
-
-    @Column(name = "productgroupcode")
-    private String productGroupCode;
-
-    @Column(name = "productname")
-    private String productName;
-
-    @Column(name = "description")
-    private String description;
-
-    @Column(name = "productamount")
-    private Integer productAmount;
-
-    @Column(name = "materielcode")
-    private String materielCode;
-
-    @Column(name = "commodityname")
-    private String commodityName;
-
-    @Column(name = "applyitcode")
-    private String applyItCode;
-
-    @Column(name = "applyname")
-    private String applyName;
-
-    @Column(name = "rmaterialcodereplyitcode")
-    private String rmaterialCodeReplyItCode;
-
-    @Column(name = "materialcodereplyname")
-    private String materialCodeReplyName;
-
-    @Column(name = "materialcodereplydate")
-    private Date materialCodeReplyDate;
-
-    @Column(name = "bocode")
-    private String boCode;
-
-    @Column(name = "epcode")
-    private String epCode;
-
-    @Column(name = "projectname")
-    private String projectName;
-
-    @Column(name = "specialseriesno")
-    private String specialSeriesNo;
-
-    @Column(name = "isdownload")
-    private Integer isDownload;
-
-    @Column(name = "downloadlastdate")
-    private Date downloadLastDate;
-
-    @Column(name = "plant")
-    private String plant;
-
-    @Column(name = "developstate")
-    private Integer developState;
-
-    @Column(name = "visible")
-    private Integer visible;
-
-    @Column(name = "isupdate")
-    private Integer isUpdate;
-
-    @Column(name = "updatedate")
-    private Date updateDate;
-
-    @Column(name = "iscode")
-    private String isCode;
-
-    @Column(name = "isname")
-    private String isName;
-
-    @Column(name = "flagnewmaterial")
-    private Integer flagNewMaterial;
-
-    @Column(name = "supplementaryinformation")
-    private String supplementaryInformation;
-
-    @Column(name = "replyremarks")
-    private String replyRemarks;
-
-    @Column(name = "contractnumber")
-    private String contractNumber;
-
-    @Column(name = "replytype")
-    private Integer replyType;
-
-    @Column(name = "bospecialbomproductid")
-    private Integer boSpecialBomProductId;
-}

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

@@ -173,6 +173,8 @@ public class SuperBomSkuInfo  extends BasePageDto implements Serializable {
      */
     @Column(name = "unit")
     private String unit;
+    @Column(name = "plm_msg")
+    private String plmMsg;
 
     /**
      * id
@@ -186,6 +188,8 @@ public class SuperBomSkuInfo  extends BasePageDto implements Serializable {
      */
     @Transient
     private String unisSalesName;
+    @Transient
+    private String token;
 
     private List<SuperBomSkuConfigInfo> characteristicList;
 

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

@@ -23,4 +23,6 @@ public class UserInfo {
     private String password;
     @Column(name = "user_name")
     private String userName;
+    @Column(name = "user_dimension")
+    private String userDimension;
 }

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

+package cn.com.uitech.authorization.pojo.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.models.auth.In;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.sql.Timestamp;
+
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@ToString
+@Table(name = "user_menu_info")
+@Builder
+@ApiModel("user_menu_info")
+public class UserMenuInfo {
+    @Column(name = "user_code")
+    private String userCode;
+    @Column(name = "menu_id")
+    private Integer menuId;
+    @Column(name = "update_time")
+    private Timestamp updateTime;
+}

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

@@ -19,7 +19,7 @@ public interface CtoBomService {
      * @param ctoBomRequestParamDto
      * @return cto物料集合
      */
-    PageInfo<ConfigurableBom> getCtoBoms(CtoBomRequestParamDto ctoBomRequestParamDto);
+    Object getCtoBoms(CtoBomRequestParamDto ctoBomRequestParamDto);
 
     /**
      * 根据bomcode修改cto物料
@@ -71,4 +71,6 @@ public interface CtoBomService {
 
     Object getProductGroupList();
 
+    PageInfo<ConfigurableBom> getCtoBom(CtoBomRequestParamDto ctoBomRequestParamDto);
+
 }

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

@@ -25,10 +25,6 @@ public interface IntegrateService {
 
     String getName(Object v);
 
-    String getNameByCode(String characteristicCode,Integer isShow,String groupNumber);
-
-    String getVNameByCode(String characteristicValueCode,String characteristicCode);
-
     Object getSuperBomInfoByConfigId(Map<String, Object> map);
 
     Object GetSKUByH3CConfigInfo(GetSKUByH3CConfigInfo configSkuInfo);
@@ -48,4 +44,6 @@ public interface IntegrateService {
     Object querySkuOne(String configId);
 
     Object getToken(UserInfo userinfo);
+
+    Object getUserDimension(UserInfo userinfo);
 }

src/main/java/cn/com/uitech/authorization/service/impl/CharacteristicValueServiceImpl.java

@@ -5,7 +5,6 @@ import cn.com.uitech.authorization.enums.CtoStatusEnum;
 import cn.com.uitech.authorization.enums.SalesVisibleEnum;
 import cn.com.uitech.authorization.exception.BizException;
 import cn.com.uitech.authorization.mapper.CharacteristicValueMapper;
-import cn.com.uitech.authorization.mapper.OdRelationMapper;
 import cn.com.uitech.authorization.pojo.dto.*;
 import cn.com.uitech.authorization.pojo.entity.CharacteristicValue;
 import cn.com.uitech.authorization.pojo.entity.OdRelation;
@@ -60,8 +59,6 @@ public class CharacteristicValueServiceImpl implements CharacteristicValueServic
     @Autowired
     private CharacteristicValueMapper characteristicValueMapper;
 
-    @Autowired
-    private OdRelationMapper odRelationMapper;
 
     @Value("${plm.header_Authorization}")
     private String headerAuthorization;
@@ -625,7 +622,7 @@ public class CharacteristicValueServiceImpl implements CharacteristicValueServic
             //查询cv配置信息
             characteristicList = characteristicValueMapper.getInquiryPriceByCode(bomCode);
             //查询od关系
-            OdRelationList = odRelationMapper.getOdRelationList(bomCode, productGroupCode);
+            //OdRelationList = odRelationMapper.getOdRelationList(bomCode, productGroupCode);
 
             json.put("characteristicList", characteristicList);
             json.put("OdRelationList", OdRelationList);

src/main/java/cn/com/uitech/authorization/service/impl/CtoBomServiceImpl.java

@@ -10,6 +10,7 @@ import cn.com.uitech.authorization.pojo.entity.ConfigurableBom;
 import cn.com.uitech.authorization.pojo.entity.ProductDescription;
 import cn.com.uitech.authorization.pojo.entity.ProductGroup;
 import cn.com.uitech.authorization.service.CtoBomService;
+import cn.com.uitech.authorization.utils.RedisHelper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
@@ -21,6 +22,7 @@ import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example;
 
+import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -44,6 +46,9 @@ public class CtoBomServiceImpl implements CtoBomService {
     @Autowired
     private BomStatusMapper bomStatusMapper;
 
+    @Resource
+    private RedisHelper redisHelper;
+
     /**
      * 分页查询cto物料信息
      *
@@ -51,10 +56,22 @@ public class CtoBomServiceImpl implements CtoBomService {
      * @return cto物料集合
      */
     @Override
-    public PageInfo<ConfigurableBom> getCtoBoms(CtoBomRequestParamDto ctoBomRequestParamDto) {
+    public Object getCtoBoms(CtoBomRequestParamDto ctoBomRequestParamDto) {
+        if (!org.springframework.util.StringUtils.isEmpty(ctoBomRequestParamDto.getToken())) {
+            String redisToken = redisHelper.get("unis_cpq:" + ctoBomRequestParamDto.getToken());
+            if (!org.springframework.util.StringUtils.isEmpty(redisToken)) {
                 PageHelper.startPage(ctoBomRequestParamDto.getPage(), ctoBomRequestParamDto.getPerPage());
                 List<ConfigurableBom> ctoBoms = ctoBomMapper.getCtoBoms(ctoBomRequestParamDto);
                 return new PageInfo(ctoBoms);
+
+            } else {
+                ctoBomRequestParamDto.setToken(ctoBomRequestParamDto.getToken() + "token已失效,请重新申请");
+                return ctoBomRequestParamDto;
+            }
+        } else {
+            ctoBomRequestParamDto.setToken("请传入正确的token");
+            return ctoBomRequestParamDto;
+        }
     }
 
     /**
@@ -191,5 +208,12 @@ public class CtoBomServiceImpl implements CtoBomService {
         return productGroupList;
     }
 
+    @Override
+    public PageInfo<ConfigurableBom> getCtoBom(CtoBomRequestParamDto ctoBomRequestParamDto) {
+        PageHelper.startPage(ctoBomRequestParamDto.getPage(), ctoBomRequestParamDto.getPerPage());
+        List<ConfigurableBom> ctoBoms = ctoBomMapper.getCtoBoms(ctoBomRequestParamDto);
+        return new PageInfo(ctoBoms);
+    }
+
 
 }

src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java

 package cn.com.uitech.authorization.service.impl;
 
 import cn.com.uitech.authorization.controller.IntegrateController;
-import cn.com.uitech.authorization.pojo.entity.GetSKUByH3CConfigInfo;
 import cn.com.uitech.authorization.exception.BusinessException;
 import cn.com.uitech.authorization.mapper.*;
 import cn.com.uitech.authorization.pojo.dto.*;
@@ -13,7 +12,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sun.corba.se.impl.presentation.rmi.ExceptionHandler;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +29,11 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.sql.Timestamp;
-import java.util.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -60,6 +62,8 @@ public class IntegrateServiceImpl implements IntegrateService {
     private Sequence sequence;
     @Value("${plm.url}")
     private String plmUrl;
+    @Value("${selector.url}")
+    private String selectorUrl;
     @Value("${plm.token-url}")
     private String plmUrlToken;
     @Value("${plm.header_content_type_msg}")
@@ -341,11 +345,6 @@ public class IntegrateServiceImpl implements IntegrateService {
     }
 
     @Override
-    public String getNameByCode(String characteristicCode, Integer isShow, String groupNumber) {
-        return characteristicMapper.getNameByCode(characteristicCode, isShow, groupNumber);
-    }
-
-    @Override
     public Characteristic getCNameByCode(String characteristicCode, String superBomCode) {
         return characteristicMapper.getCNameByCode(characteristicCode, superBomCode);
     }
@@ -354,8 +353,8 @@ public class IntegrateServiceImpl implements IntegrateService {
     public Object GetSKUByConfigInfo(SuperBomSkuInfo superBomSkuInfo) {
 
         GetProductOutDto result = new GetProductOutDto();
+        //checkToken(superBomSkuInfo.getToken());
         if (!ObjectUtils.isEmpty(superBomSkuInfo)) {
-
             /**
              1.申请SKU->验证配置是否存在->存在->是否生成SKU->生成SKU->返回SKU信息
              2.申请SKU->验证配置是否存在->存在->是否生成SKU->未生成SKU->使用历史configid申请SKU->返回SKU信息
@@ -373,20 +372,20 @@ public class IntegrateServiceImpl implements IntegrateService {
                         List<String> items = superBomSkuInfoMapper.getConfigInfos(skuInfo.getConfigId());
                         List<String> newItems = new ArrayList<>();
                         ArrayList<SuperBomSkuConfigInfo> params = new ArrayList<>(superBomSkuInfo.getCharacteristicList());
-                        params.forEach(param -> newItems.add(param.getCharacteristicCode() + param.getCharacteristicValueCode()));
+                        params.forEach(param -> newItems.add(param.getCharacteristicCode() + param.getCharacteristicValueCode() + skuInfo.getSuperBomCode()));
                         boolean equals = items.containsAll(newItems);
                         //撞配成功
                         if (equals) {
                             SuperBomSkuInfo getSkuByConfigId = superBomSkuInfoMapper.getSkuInfoByConfigId(skuInfo.getConfigId());
-                            if(!StringUtils.isEmpty(getSkuByConfigId.getSkuCode())){
+                            if (!StringUtils.isEmpty(getSkuByConfigId.getSkuCode())) {
                                 //1.申请SKU->验证配置是否存在->存在->是否生成SKU->生成SKU->返回SKU信息
                                 superBomSkuInfo.setSkuCode(getSkuByConfigId.getSkuCode());
                                 superBomSkuInfo.setSkuName(getSkuByConfigId.getSkuName());
-                                result.setMsg("配置已存在:SKUCode:"+superBomSkuInfo.getSkuCode());
+                                result.setMsg("配置已存在:SKUCode:" + superBomSkuInfo.getSkuCode());
                                 result.setCode(500);
                                 result.setData(superBomSkuInfo);
                                 return result;
-                            }else{
+                            } else {
                                 //2.申请SKU->验证配置是否存在->存在->是否生成SKU->
                                 // 未生成SKU->使用历史configid申请SKU->返回SKU信息
                                 superBomSkuInfo.setConfigId(skuInfo.getConfigId());
@@ -453,6 +452,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                             result.setData(superBomSkuInfo);
                             return result;
                         } else {
+                            superBomSkuInfo.setPlmMsg(applySkuCodeResultDto.getMsg());
                             superBomSkuInfoMapper.updateSkuStatus(superBomSkuInfo);
                             result.setCode(applySkuCodeResultDto.getCode());
                             result.setMsg(applySkuCodeResultDto.getMsg());
@@ -460,6 +460,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                             return result;
                         }
                     } else {
+                        superBomSkuInfo.setPlmMsg(applySkuCodeResultDto.getMsg());
                         superBomSkuInfoMapper.updateSkuStatus(superBomSkuInfo);
                         result.setMsg(applySkuCodeResultDto.getMsg());
                         result.setCode(applySkuCodeResultDto.getCode());
@@ -497,6 +498,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                             result.setData(superBomSkuInfo);
                             return result;
                         } else {
+                            superBomSkuInfo.setPlmMsg(applySkuCodeResultDto.getMsg());
                             superBomSkuInfoMapper.updateSkuStatus(superBomSkuInfo);
                             result.setCode(applySkuCodeResultDto.getCode());
                             result.setMsg(applySkuCodeResultDto.getMsg());
@@ -504,6 +506,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                             return result;
                         }
                     } else {
+                        superBomSkuInfo.setPlmMsg(applySkuCodeResultDto.getMsg());
                         superBomSkuInfoMapper.updateSkuStatus(superBomSkuInfo);
                         result.setMsg(applySkuCodeResultDto.getMsg());
                         result.setCode(applySkuCodeResultDto.getCode());
@@ -531,9 +534,11 @@ public class IntegrateServiceImpl implements IntegrateService {
 
     @Override
     public Object GetConfigBySUKINFO(SuperBomSkuInfo superBomSkuInfo) {
+        GetProductOutDto result = new GetProductOutDto();
+        //checkToken(superBomSkuInfo.getToken());
+
         //撞配
         SuperBomSkuInfo returnSkuInfo = new SuperBomSkuInfo();
-        GetProductOutDto result = new GetProductOutDto();
         superBomSkuInfo.setApplyUser("CRM");
         Object ob = GetSKUByConfigInfo(superBomSkuInfo);
         boolean flag = ob instanceof GetProductOutDto;
@@ -558,7 +563,24 @@ public class IntegrateServiceImpl implements IntegrateService {
             return result;
         }
 
+    }
 
+    private GetProductOutDto checkToken(String token) {
+        GetProductOutDto result = new GetProductOutDto();
+        if (!StringUtils.isEmpty(token)) {
+            String redisToken = redisHelper.get("unis_cpq:" + token);
+            if (!StringUtils.isEmpty(redisToken)) {
+            } else {
+                result.setMsg(token + "token已失效,请重新申请");
+                result.setCode(500);
+                return result;
+            }
+        } else {
+            result.setMsg("请传入正确的token");
+            result.setCode(500);
+            return result;
+        }
+        return result;
     }
 
     /**
@@ -584,10 +606,40 @@ public class IntegrateServiceImpl implements IntegrateService {
         GetProductOutDto result = new GetProductOutDto();
         UserInfo getOne = userInfoMapper.getUser(userinfo);
         if (!ObjectUtils.isEmpty(getOne)) {
-            String md5Str = MD5Util.getMD5Str(getOne.getPassword() + "_unis_cpq_" + getOne.getUserCode());
+            String redis = redisHelper.get("unis_cpq:" + getOne.getUserCode());
+            if (StringUtils.isEmpty(redis)) {
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+                Date date = new Date(System.currentTimeMillis());
+                String md5Str = MD5Util.getMD5Str(getOne.getPassword() + "_unis_cpq_" + getOne.getUserCode() + formatter.format(date));
                 String doubleMd5 = MD5Util.getMD5Str(md5Str);
                 result.setData(doubleMd5);
-            redisHelper.set("unis_cpq:" + getOne.getUserCode() + "_" + getOne.getPassword(), doubleMd5, 86400);
+                result.setCode(200);
+                redisHelper.set("unis_cpq:" + getOne.getUserCode(), doubleMd5, 86400);
+            } else {
+                result.setData(redis);
+                result.setCode(200);
+            }
+        } else {
+            result.setMsg("用户不存在/密码错误");
+            result.setCode(500);
+        }
+        return result;
+    }
+
+    @Override
+    public Object getUserDimension(UserInfo userinfo) {
+        GetProductOutDto result = new GetProductOutDto();
+        UserInfo getOne = userInfoMapper.getUser(userinfo);
+        if (!ObjectUtils.isEmpty(getOne)) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = new Date(System.currentTimeMillis());
+            String md5Str = MD5Util.getMD5Str(getOne.getPassword() + "_unis_cpq_" + getOne.getUserCode() + formatter.format(date));
+            String doubleMd5 = MD5Util.getMD5Str(md5Str);
+            List<MenuInfo> list = userInfoMapper.getUserDimension(getOne.getUserCode());
+            result.setData(list);
+            result.setMsg(doubleMd5);
+            result.setCode(200);
+            redisHelper.set("unis_cpq:" + doubleMd5, doubleMd5, 86400);
         } else {
             result.setMsg("用户不存在/密码错误");
             result.setCode(500);
@@ -678,11 +730,6 @@ public class IntegrateServiceImpl implements IntegrateService {
     }
 
     @Override
-    public String getVNameByCode(String characteristicValueCode, String characteristicCode) {
-        return characteristicValueMapper.getVNameByCode(characteristicValueCode, characteristicCode);
-    }
-
-    @Override
     public Object getSuperBomInfoByConfigId(Map<String, Object> map) {
         String configId = (String) map.get("configId");
         String skuCode = (String) map.get("skuCode");
@@ -771,6 +818,7 @@ public class IntegrateServiceImpl implements IntegrateService {
     @Override
     public Object GetSKUByH3CConfigInfo(GetSKUByH3CConfigInfo configSkuInfo) {
 
+        //checkToken(configSkuInfo.getToken());
                   /*
                     1.使用H3CPN匹配SKU表中SuperBOM
                     2.比对SKU下的所有配置，都在H3C清单中，就算匹配成功
@@ -807,15 +855,15 @@ public class IntegrateServiceImpl implements IntegrateService {
                                 } else {
                                     // 查询出superBom下所有isH3C的数据 characteristicH3CList 比较 是否都有传
                                     boolean contains = h3cCodeList.contains(characteristicValue.getCharacteristicCode());
-                                        if(!contains){
+                                    if (!contains) {
                                         Integer isH3C = characteristicMapper.getCharacteristicInfo(characteristicValue.getCharacteristicCode(), configurableBom.getSuperBomCode());
-                                            if(isH3C.equals(1)){
+                                        if (isH3C.equals(1)) {
                                             //不存在数据库isH3C的数据返回报错
                                             cpnList.setMsg("CPQ数据验证失败，失败原因：" + characteristicValue.getCharacteristicCode() + "特征不能为空!");
                                             cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
                                             flag = false;
                                             break;
-                                            }else{
+                                        } else {
                                             //验证H3CVCODE是否下架
                                             if (characteristicValue.getIsState() == 0) {
                                                 cpnList.setMsg("CPQ数据验证失败，失败原因：" + characteristicValue.getCharacteristicValueCode() + "已下架!");
@@ -827,7 +875,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                                                 flag = true;
                                             }
                                         }
-                                        }else{
+                                    } else {
                                         //验证H3CVCODE是否下架
                                         if (characteristicValue.getIsState() == 0) {
                                             cpnList.setMsg("CPQ数据验证失败，失败原因：" + characteristicValue.getCharacteristicValueCode() + "已下架!");
@@ -842,9 +890,9 @@ public class IntegrateServiceImpl implements IntegrateService {
 
                                 }
                             }
-                        }else{
+                        } else {
                             //没有configid
-                            cpnList.setMsg(configurableBom.getSuperBomCode()+"没有维护默认值");
+                            cpnList.setMsg(configurableBom.getSuperBomCode() + "没有维护默认值");
                             cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
                             continue;
                         }
@@ -855,7 +903,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                         continue;
                     }
                     //有superbom 有configid h3cvcode存在 没有下架 设置true进行撞配
-                    if(flag){
+                    if (flag) {
                         //根据configId生成配置
                         GetConfigurationInputDTO getConfigurationInputDTO = new GetConfigurationInputDTO();
                         List<String> configIds = new ArrayList<>();
@@ -865,20 +913,21 @@ public class IntegrateServiceImpl implements IntegrateService {
                         Object getConfigData = getConfigInfo(getConfigurationInputDTO);
                         Object o = JSONObject.toJSON(getConfigData);
                         List<Object> objects = (List<Object>) o;
-                        Map<String,Object> map = (Map<String, Object>) objects.get(0);
+                        Map<String, Object> map = (Map<String, Object>) objects.get(0);
                         Object superBomInfo = map.get("superBomInfo");
                         SuperBomSkuInfo superBomSkuInfo = new SuperBomSkuInfo();
                         ArrayList<SuperBomSkuConfigInfo> configs = new ArrayList<>();
                         superBomSkuInfo.setSuperBomCode(configurableBom.getSuperBomCode());
                         superBomSkuInfo.setConfigId(configurableBom.getConfigId());
                         //H3C 过来写死 CTO
-                        BeanUtils.copyProperties(superBomInfo,superBomSkuInfo);
+                        BeanUtils.copyProperties(superBomInfo, superBomSkuInfo);
+                        superBomSkuInfo.setToken(configSkuInfo.getToken());
                         superBomSkuInfo.setPatern("CTO");
                         superBomSkuInfo.setApplyUser("H3C");
                         Integer politicalMiningId = cpnList.getPoliticalMiningId();
-                        if(politicalMiningId.equals(1)){
+                        if (politicalMiningId.equals(1)) {
                             superBomSkuInfo.setPoliticalMiningId("是");
-                        }else{
+                        } else {
                             superBomSkuInfo.setPoliticalMiningId("否");
                         }
                         SuperBomSkuInfo aa = (SuperBomSkuInfo) superBomInfo;
@@ -888,11 +937,11 @@ public class IntegrateServiceImpl implements IntegrateService {
                         //根据ccode  vcode 替换list信息
                         List<GetSKUByH3CConfigInfo.KeyValues> paramList = cpnList.getSelectedCharacteristicList();
                         //循环配置表信息
-                        characteristicList.forEach(characteristic->{
+                        characteristicList.forEach(characteristic -> {
                             //循环传进来的值信息
-                            paramList.forEach(param->{
+                            paramList.forEach(param -> {
                                 CharacteristicValue characteristicValue = characteristicValueMapper.getCharacteristicValueInfoByCode(param.getH3cVCode(), configurableBom.getSuperBomCode());
-                                if(characteristic.getCharacteristicCode().equals(characteristicValue.getCharacteristicCode())){
+                                if (characteristic.getCharacteristicCode().equals(characteristicValue.getCharacteristicCode())) {
                                     characteristic.setCharacteristicValueCode(characteristicValue.getCharacteristicValueCode());
                                     characteristic.setCharacteristicValueName(characteristicValue.getCharacteristicValueName());
                                     characteristic.setUnisSalesVName(characteristicValue.getUnisSalesVName());
@@ -919,13 +968,13 @@ public class IntegrateServiceImpl implements IntegrateService {
                         selectorEntity.setProductClassCode(((SuperBomSkuInfo) superBomInfo).getProductClassCode());
                         selectorEntity.setSuperBomCode(((SuperBomSkuInfo) superBomInfo).getSuperBomCode());
                         Object initializationData = integrateController.initializationData(selectorEntity);
-                        Map<String,Object> initMap= (Map<String, Object>) JSONObject.toJSON(initializationData);
-                        Map<String,Object> dataMap = (Map<String, Object>) initMap.get("data");
+                        Map<String, Object> initMap = (Map<String, Object>) JSONObject.toJSON(initializationData);
+                        Map<String, Object> dataMap = (Map<String, Object>) initMap.get("data");
                         String sessionId = (String) dataMap.get("sessionId");
                         buildConfigurationInputDTO.setSessionId(sessionId);
                         List<BuildConfigurationInputDTO.SelectedCharacteristicListBean> selectedCharacteristicListBeans = new ArrayList<>();
                         //传入的pnlist
-                        superBomSkuInfo.getCharacteristicList().forEach(selectedCharacteristic->{
+                        superBomSkuInfo.getCharacteristicList().forEach(selectedCharacteristic -> {
                             BuildConfigurationInputDTO.SelectedCharacteristicListBean selectedCharacteristicListBean = new BuildConfigurationInputDTO.SelectedCharacteristicListBean();
                             //根据 list里面的vcode 查询v信息和c信息 赋值到 生成配置的对象里
                             selectedCharacteristicListBean.setCharacteristicName(selectedCharacteristic.getCharacteristicName());
@@ -936,7 +985,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                         buildConfigurationInputDTO.setSelectedCharacteristicList(selectedCharacteristicListBeans);
                         buildConfigurationInputDTO.setKeyValues(null);
                         Object buildConfiguration = integrateController.buildConfiguration(buildConfigurationInputDTO, null);
-                        Map<String,Object> buildConfigurationMap = (Map<String, Object>) JSONObject.toJSON(buildConfiguration);
+                        Map<String, Object> buildConfigurationMap = (Map<String, Object>) JSONObject.toJSON(buildConfiguration);
                         String configId = (String) buildConfigurationMap.get("configId");
                         superBomSkuInfo.setConfigId(configId);
                         //撞配之前调用前置验证
@@ -947,7 +996,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                         postVerifyInputDTO.setOperator("system");
                         postVerifyInputDTO.setSessionId(sessionId);
                         List<PostVerifyInputDTO.SelectedCharacteristicListBean> selectedCharacteristicLists = new ArrayList<>();
-                        superBomSkuInfo.getCharacteristicList().forEach(selectedCharacteristic->{
+                        superBomSkuInfo.getCharacteristicList().forEach(selectedCharacteristic -> {
                             PostVerifyInputDTO.SelectedCharacteristicListBean selectedCharacteristicListBean = new PostVerifyInputDTO.SelectedCharacteristicListBean();
                             //根据 list里面的vcode 查询v信息和c信息 赋值到 生成配置的对象里
                             selectedCharacteristicListBean.setCharacteristicName(selectedCharacteristic.getCharacteristicName());
@@ -958,7 +1007,7 @@ public class IntegrateServiceImpl implements IntegrateService {
                         postVerifyInputDTO.setSelectedCharacteristicList(selectedCharacteristicLists);
                         Object preVerify = integrateController.preVerify(postVerifyInputDTO, null);
                         Map<String, Object> preVerifyMap = (Map<String, Object>) JSONObject.toJSON(preVerify);
-                        if(preVerifyMap.get("result").equals(true)){
+                        if (preVerifyMap.get("result").equals(true)) {
                             //撞配 找PLM申请SKU
                             Object ob = GetSKUByConfigInfo(superBomSkuInfo);
                             boolean flag1 = ob instanceof GetProductOutDto;
@@ -973,20 +1022,56 @@ public class IntegrateServiceImpl implements IntegrateService {
                                     cpnList.setCode(code);
                                 } else {
                                     Object data = map1.get("data");
+                                    if (!ObjectUtils.isEmpty(data)) {
                                         Object data2 = JSONObject.toJSON(data);
                                         Map<String, Object> map2 = (Map<String, Object>) data2;
-                                    if(!ObjectUtils.isEmpty(map2)){
+                                        if (!ObjectUtils.isEmpty(map2)) {
                                             cpnList.setSkuCode((String) map2.get("skuCode"));
                                             cpnList.setSkuName((String) map2.get("skuName"));
                                             cpnList.setPatern("CTO");
                                             cpnList.setCode(200);
                                         }
+                                    } else {
+                                        cpnList.setMsg((String) map1.get("msg"));
+                                        cpnList.setCode(500);
                                     }
+
                                 }
-                        }else{
+                            }
+                        } else {
                             cpnList.setCode(500);
-                            cpnList.setMsg("配置结果违反约束冲突"+(String) preVerifyMap.get("message"));
+                            cpnList.setMsg("配置结果违反约束冲突" + (String) preVerifyMap.get("message"));
+                                }
+                            }
+                        }else{
+                    if (!ObjectUtils.isEmpty(configurableBom)) {
+                        if (!ObjectUtils.isEmpty(configurableBom.getConfigId())) {
+                            //查询出superBom下所有isH3C的数据
+                            List<Characteristic> characteristicH3CList = characteristicMapper.getCharacteristicH3CList(configurableBom.getSuperBomCode());
+                            List<String> h3cCodeList = new ArrayList<>();
+                            for (Characteristic characteristic : characteristicH3CList) {
+                                if (characteristic.getIsH3C().equals(1)) {
+                                    h3cCodeList.add(characteristic.getCharacteristicName());
+                                }
+                            }
+                            //验证H3CVCODE 是否存在
+                            for (String name : h3cCodeList) {
+                                cpnList.setMsg("CPQ数据验证失败，失败原因：" + name + "特征不能为空!");
+                                cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                                break;
+                            }
+                        } else {
+                            //没有configid
+                            cpnList.setMsg(configurableBom.getSuperBomCode() + "没有维护默认值");
+                            cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                            continue;
                         }
+                    } else {
+                        //没有superbom
+                        cpnList.setMsg("H3CPN没有维护对照关系");
+                        cpnList.setCode(ApiResult.INTERNAL_SERVER_ERROR.getCode());
+                        continue;
+
                     }
                 }
             }
@@ -1011,7 +1096,7 @@ public class IntegrateServiceImpl implements IntegrateService {
         HttpHeaders headers = getHttpHeader();
         getConfigurationInputDTO.setOperator("system");
         HttpEntity<String> requestEntity = new HttpEntity<String>(JSON.toJSONString(getConfigurationInputDTO), headers);
-        ResponseEntity<String> responseEntity = restTemplate.exchange("http://10.0.4.24:8080/api/v1/selector/configurations", HttpMethod.POST, requestEntity, String.class);
+        ResponseEntity<String> responseEntity = restTemplate.exchange(selectorUrl+"/configurations", HttpMethod.POST, requestEntity, String.class);
         JSONObject object = JSONObject.parseObject(responseEntity.getBody());
         if (!ObjectUtils.isEmpty(object)) {
             Object data = object.get("data");

src/main/resources/application-lcrx-prod.yml

+spring:
+  redis:
+    host: 172.16.0.94
+    port: 6379
+    database: 0
+    ssl: false
+    jedis:
+      pool:
+        max-active: 50
+        max-idle: 30
+        max-wait: 1000ms
+    password: zg2020cpq
+  jpa:
+    hibernate:
+      naming:
+        implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+      ddl-auto: none
+    properties:
+      hibernate:
+        temp:
+          use_jdbc_metadata_defaults: false
+    database-platform: org.hibernate.dialect.PostgreSQLDialect
+  datasource:
+    url: jdbc:postgresql://172.16.0.91:5432/cpq?currentSchema=public
+    username: postgres
+    password: zg2020cpq
+    driverClassName: org.postgresql.Driver
+    hikari:
+      maximum-pool-size: 30
+      minimum-idle: 10
+      connection-test-query: SELECT 1
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      idle-timeout: 30000
+  sleuth:
+    sampler:
+      probability: 1.0
+
+selector:
+  url: http://172.16.0.89:8080/api/v1/selector
+
+management:
+  health:
+    defaults:
+      enabled: false
+plm:
+  url: https://api.unispc.com/restcloud/Windchill/servlet/rest/cpq/v1/selectionConfiguration
+  urlH: https://api.unispc.com/restcloud/Windchill/servlet/rest/cpq/v1/h3cMapping
+  token-url: https://api.unispc.com/restcloud/Windchill/servlet/rest/security/csrf
+  header_content_type_msg: application/json
+  header_Authorization: Basic Y3BxdXNlcjAxOnp6Q1BRVW5pc0AkMTIzMQ==

src/main/resources/application-lcrx.yml

@@ -2,8 +2,7 @@ spring:
   redis:
     host: 10.0.4.26
     port: 6379
-    cto-database: 1
-    db-database: 2
+    password : zg2020cpq
     database: 0
     ssl: false
     jedis:
@@ -39,7 +38,7 @@ spring:
       probability: 1.0
 
 selector:
-  url: http://127.0.0.1:8080
+  url: http://10.0.4.24:8080/api/v1/selector
 
 management:
   health:
@@ -51,11 +50,3 @@ plm:
   token-url: https://api-test.unispc.com/restcloud/Windchill/servlet/rest/security/csrf
   header_content_type_msg: application/json
   header_Authorization: Basic d2NhZG1pbjp3Y2FkbWlu
-webservices:
-  username: integration_cf
-  password: integration_cf
-  url: http://10.101.30.84:80/Windchill/servlet/CRMService?wsdl
-  namespace: http://service.crm.ext/
-  interfaces: CFWebServiceInterface
-  lms-url: http://10.101.36.57:80/Windchill/servlet/CrmMarkMtmService?wsdl
-  lms-interfaces: CrmMarkMtmServiceInterface
\ No newline at end of file

src/main/resources/application.yml

@@ -2,22 +2,12 @@ server:
   port: 8081
 spring:
   profiles:
-    active: lcrx
+    active: lcrx-prod
   application:
     name: ${APPLICATION_NAME:uitech}--${SERVICE_NAME:system}
   # 遇到相同名字时，是否允许覆盖注册
   main:
     allow-bean-definition-overriding: true
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    password: zg2020cpq
-    jedis:
-      pool:
-        max-active: 8
-        max-wait: -1
-    timeout: 30000
-    database: 6
 ### MyBatis ###
 mybatis:
   mapper-locations: classpath:mapper/*.xml

src/main/resources/mapper/CharacteristicMapper.xml

@@ -49,6 +49,7 @@
                 sort = #{sort}
         where
                 Characteristic_Code=#{characteristicCode}
+                and super_bom_code = #{superBomCode}
     </update>
 
     <update id="updateVisibleType" parameterType="cn.com.uitech.authorization.pojo.dto.CharacteristicRequestParamDto">

src/main/resources/mapper/CharacteristicValueMapper.xml

@@ -92,11 +92,10 @@
         qualify_date=#{qualifyDate},
         unis_sales_v_name=#{unisSalesVName},
         h3c_c_value=#{h3cCValue}
-        <where>
-            <if test="characteristicValueCode!=null and characteristicValueCode.length>0">
+         where
                 Characteristic_Value_Code=#{characteristicValueCode}
-            </if>
-        </where>
+            and Characteristic_Code=#{characteristicCode}
+            and super_bom_code = #{superBomCode}
     </update>
 
     <select id="getBomCodeByValueCode"
@@ -340,4 +339,11 @@
     <insert id="saveDeployPlm">
         insert into deploy_plm_log (param,result,update_time) values (#{param},#{result},now())
     </insert>
+
+    <select id="getCharacteristicValueInfoByCCode"
+            resultType="cn.com.uitech.authorization.pojo.entity.CharacteristicValue">
+        select * from super_characteristic_value_info
+        where h3c_c_value = #{h3cVCode}
+        and super_bom_code = #{h3cPn}
+    </select>
 </mapper>

src/main/resources/mapper/PriceMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.uitech.authorization.mapper.PricecalexpressionMapper">
-
-    <!--标配价格维护查询-->
-    <select id="getPriceStandModelList" resultType="cn.com.uitech.authorization.pojo.entity.PriceInfoDto">
-        SELECT DISTINCT
-        *
-        FROM
-        standardbom sdb
-        LEFT JOIN a_productgroupcode apg ON sdb.productgroupcode = apg.productgroupcode
-        LEFT JOIN a_producthierarchy pph ON sdb.phid=pph.phid  and sdb.productgroupcode = pph.productgroupcode
-        LEFT JOIN price P ON sdb.priceid = P.priceid
-        LEFT JOIN pricecalexpression pps ON sdb.bomcode = pps.bomcode AND sdb.productgroupcode = pps.productgroupcode
-        LEFT JOIN standardbomext sbe ON sdb.bomcode = sbe.bomcode AND sdb.productgroupcode = sbe.productgroupcode
-        <where>
-            1=1
-            <if test="productGroupCode!=null and productGroupCode!=''">
-                and sdb.productgroupcode = #{productGroupCode}
-            </if>
-            <if test="phId!=null and phId!=''">
-                and sdb.phid = #{phId}
-            </if>
-            <if test="name!=null and name!=''">
-                and sdb.NAME like CONCAT('%','${name}','%')
-            </if>
-            <if test="bomCodeZ!=null">
-                and sdb.bomcode like CONCAT('%','${bomCodeZ}','%')
-            </if>
-            <if test="status!=null">
-                and sdb.status = #{status}
-            </if>
-        </where>
-        order by sequence,r3enname
-    </select>
-
-    <!--常规价格维护-->
-    <select id="getPriceCtoModelList" resultType="cn.com.uitech.authorization.pojo.entity.PriceInfoDto">
-        SELECT DISTINCT
-        *
-        FROM
-        configurablebom sdb
-        LEFT JOIN a_productgroupcode apg ON sdb.productgroupcode = apg.productgroupcode
-        LEFT JOIN a_producthierarchy pph ON sdb.phid=pph.phid
-        LEFT JOIN price P ON sdb.priceid = P.priceid
-        LEFT JOIN pricecalexpression pps ON sdb.bomcode = pps.bomcode AND sdb.productgroupcode = pps.productgroupcode
-        <where>
-            1=1
-            <if test="productGroupCode!=null and productGroupCode!=''">
-                and sdb.productgroupcode = #{productGroupCode}
-            </if>
-            <if test="phId!=null and phId!=''">
-                and sdb.phid = #{phId}
-            </if>
-            <if test="bomCode!=null and bomCode!=''">
-                and sdb.bomcode like CONCAT('%','${bomCode}','%')
-            </if>
-            <if test="name!=null and name!=''">
-                and sdb.NAME like CONCAT('%','${name}','%')
-            </if>
-            <if test="status!=null">
-                and sdb.status = #{status}
-            </if>
-        </where>
-        order by sequence,r3enname
-    </select>
-
-    <!--部件价格维护-->
-    <select id="getPriceCtoTypeModelList" resultType="cn.com.uitech.authorization.pojo.entity.PriceInfoDto">
-        SELECT DISTINCT
-            sdb.name,cv.characteristicValueCode,cv.name nameV,c.name nameC,cv.priceId priceIdV,cv.actualcostprice,cv.agentprice,cv.bocostprice,cv.r3ename r3EName,sdb.*,cv.*,c.*,p.*,pps.*
-        FROM
-            characteristicvalue cv
-            INNER JOIN characteristic c ON cv.characteristiccode = c.characteristiccode and c.productgroupcode = cv.productgroupcode
-            INNER JOIN configurablebom sdb ON sdb.productgroupcode = c.productgroupcode and sdb.bomcode = c.bomcode
-            LEFT JOIN a_productgroupcode apg ON sdb.productgroupcode = apg.productgroupcode
-            LEFT JOIN a_producthierarchy pph ON sdb.phid=pph.phid
-            LEFT JOIN price P ON cv.priceid = P.priceid
-            LEFT JOIN pricecalexpression pps ON sdb.bomcode = pps.bomcode AND sdb.productgroupcode = pps.productgroupcode
-            <where>
-                1=1
-                and c.r3hiden = 0
-                and c.charactertype='0'
-                <if test="productGroupCode!=null and productGroupCode!=''">
-                    and sdb.productgroupcode = #{productGroupCode}
-                </if>
-                <if test="phId!=null and phId!=''">
-                    and sdb.phid = #{phId}
-                </if>
-                <if test="bomCode!=null and bomCode!=''">
-                    and sdb.bomcode = #{bomCode}
-                </if>
-                <if test="characteristicCode!=null">
-                    and cv.characteristicvaluecode like CONCAT('%','${characteristicCode}','%')
-                </if>
-                <if test="name!=null and name!=''">
-                    and cv.NAME like CONCAT('%','${name}','%')
-                </if>
-                <if test="eccBomCodeV!=null and eccBomCodeV!=''">
-                    and cv.characteristicvaluecode like CONCAT('%','${eccBomCodeV}','%')
-                </if>
-                <if test="status!=null">
-                    and sdb.status = #{status}
-                </if>
-                <if test="statusV!=null">
-                    and cv.status = #{statusV}
-                </if>
-            </where>
-            order by cv.sequence,cv.r3ename
-    </select>
-    <select id="getPriceModInfo" resultType="cn.com.uitech.authorization.pojo.entity.Pricecalexpression">
-        select * from  Pricecalexpression where productgroupcode=#{productGroupCode} and productType = #{productType}
-        <if test="phId!=null and phId!='' and phId==-1 and bomCode!=null">
-            and bomcode = #{bomCode}
-        </if>
-
-        <if test="phId!=null and phId!=''">
-            and phid = #{phId}
-        </if>
-
-        <if test="bomCode!=null and bomCode!='' and bomCode=='-1' and phId!=null">
-            and phid = #{phId}
-        </if>
-
-        <if test="bomCode!=null and bomCode!=''">
-            and bomcode = #{bomCode}
-        </if>
-    </select>
-
-    <select id="getFatherPhId" resultType="integer">
-        select fatherPhId from a_producthierarchy where phid = #{phId}
-    </select>
-
-    <insert id="insertPriceModInfo">
-        INSERT INTO pricecalexpression
-        (
-            phid,
-            producttype,
-            expressiontype,
-            productgroupcode,
-            bomcode,
-            pricetype,
-            salecostadjustmod,
-            costsupportmod,
-            strictcontrolmod,
-            salesmanagermod
-        )
-        VALUES
-	    (
-            #{ phId },
-            #{ productType },
-            #{ expressionType },
-            #{ productGroupCode },
-            #{ bomCode },
-            #{ priceType },
-            #{ saleCostAdjustMod },
-            #{ costSupportMod },
-            #{ strictControlMod },
-            #{ salesManagerMod }
-        )
-    </insert>
-    <update id="updatePriceMod">
-        UPDATE
-            pricecalexpression
-        SET
-            bomCode = #{bomCode},
-            priceType = #{ priceType },
-            saleCostAdjustMod = #{ saleCostAdjustMod },
-            costSupportMod = #{ costSupportMod },
-            strictControlMod = #{ strictControlMod },
-            salesManagerMod = #{ salesManagerMod }
-        WHERE
-            productGroupCode = #{ productGroupCode } and phId = #{ phId } and productType = #{ productType } and expressionType = #{ expressionType }
-    </update>
-
-    <select id="getPriceModModel" resultType="cn.com.uitech.authorization.pojo.entity.Pricecalexpression">
-        select * from  Pricecalexpression
-        where productgroupcode=#{productGroupCode} and producttype = #{productType}
-        <if test="phId != null and phId != '' ">
-            and phid = #{phId}
-        </if>
-        <if test="bomCode != null  ">
-            and bomcode = #{bomCode}
-        </if>
-    </select>
-
-    <select id="getLevel" parameterType="integer" resultType="integer">
-        select level from a_producthierarchy where phid = #{value}
-    </select>
-
-    <!-- 修改标配表的代理价   标准成本  大客户总经理价 -->
-    <update id="updateStandardBomModel">
-        UPDATE
-            standardbom
-        SET
-            agentPrice = #{ agentPrice },
-            boCostPrice = #{ boCostPrice },
-            actualCostPrice = #{ actualCostPrice },
-            updatetime = now(),
-            priceId = #{priceId}
-        WHERE
-            productGroupCode = #{ productGroupCode } and bomCode = #{ bomCode }
-    </update>
-
-    <!-- 修改CTO表的代理价   标准成本  大客户总经理价 -->
-    <update id="updateCtoBomModel">
-        UPDATE
-            configurablebom
-        SET
-            agentPrice = #{ agentPrice },
-            boCostPrice = #{ boCostPrice },
-            actualCostPrice = #{ actualCostPrice },
-            updatetime = now(),
-            priceId = #{priceId}
-        WHERE
-            productGroupCode = #{ productGroupCode } and bomCode = #{ bomCode }
-    </update>
-
-    <select id="getPriceInfo" resultType="cn.com.uitech.authorization.pojo.entity.Price" parameterType="integer">
-        select * from price where priceId = #{priceId}
-    </select>
-
-    <select id="selectMaxId" resultType="integer">
-        select MAX(priceId) from price
-    </select>
-
-    <update id="updatePriceConfirm">
-        UPDATE
-        price
-        SET
-        isConfirmPrice = #{isConfirmPrice},
-        saleCostPrice = #{ saleCostPrice },
-        costSupportPrice = #{ costSupportPrice },
-        strictControlPrice = #{ strictControlPrice },
-        salesManagerPrice = #{ salesManagerPrice }
-        WHERE
-        priceId = #{priceId};
-    </update>
-    <insert id="insertPrice">
-        INSERT INTO price
-        (
-            isConfirmPrice,
-            saleCostPrice,
-            costSupportPrice,
-            strictControlPrice,
-            salesManagerPrice,
-            code,
-            pgcode
-        )
-        VALUES
-	    (
-            #{isConfirmPrice},
-            #{saleCostPrice},
-            #{costSupportPrice},
-            #{strictControlPrice},
-            #{salesManagerPrice},
-            #{bomCode},
-            #{productGroupCode}
-        )
-        RETURNING priceId
-    </insert>
-
-    <delete id="deletePriceMod">
-        DELETE
-        FROM
-            pricecalexpression
-        WHERE
-            phid = #{ phId }
-            AND producttype = #{ productType }
-            AND expressiontype = #{ expressionType }
-            AND bomcode = #{ bomCode }
-            AND productgroupcode = #{ productGroupCode }
-    </delete>
-    <delete id="deleteByCode">
-        delete from price where code = #{code} and pgcode=#{pgCode}
-    </delete>
-
-    <!--刷入标准成本标配-->
-    <update id="updatePriceStandard">
-        UPDATE StandardBOM A
-        SET ActualCostPrice =
-        CASE
-            WHEN
-                A.RefCostPrice > 0
-            THEN
-                A.RefCostPrice * b.I2Ratio
-            ELSE ActualCostPrice
-        END
-        FROM
-            A_ProductGroupBaseRatio b
-        WHERE
-        ActualCostPrice is null
-        and A.ProductGroupCode = b.ProductGroupCode
-        AND A.ProductGroupCode = #{productGroupCode};
-    </update>
-
-    <!--刷入4X成本标配-->
-    <update id="updatePriceFourLevelStandard">
-         UPDATE StandardBOM a
-            SET BOCostPrice =
-            CASE
-                WHEN a.ActualCostPrice > 0
-                THEN
-                    a.ActualCostPrice * b.BaseRatio
-                ELSE BOCostPrice
-            END
-            FROM
-               A_ProductGroupBaseRatio b
-            WHERE
-            BOCostPrice is null
-            and a.ProductGroupCode = b.ProductGroupCode
-            AND a.ProductGroupCode = #{productGroupCode};
-    </update>
-
-    <!--刷入标准成本常规特配-->
-    <update id="updatePriceCto">
-        UPDATE CharacteristicValue v
-        SET ActualCostPrice =
-        CASE
-            WHEN v.RefCostPrice > 0
-            THEN
-                v.RefCostPrice * A.I2Ratio
-            ELSE ActualCostPrice
-        END
-        FROM Characteristic C, A_ProductGroupBaseRatio A
-        WHERE
-            ActualCostPrice is null
-            and C.CharacteristicCode = v.CharacteristicCode
-            AND v.ProductGroupCode = C.ProductGroupCode
-            AND C.BOMCode = #{bomCode}
-            AND C.ProductGroupCode = #{productGroupCode}
-            AND ( v.RefCostPrice != 0 OR v.ActualCostPrice = 0 )
-            AND A.ProductGroupCode = #{productGroupCode};
-    </update>
-
-    <!--刷入4X成本常规特配-->
-    <update id="updatePriceFourLevelCto">
-        UPDATE CharacteristicValue v
-        SET BOCostPrice =
-        CASE
-            WHEN v.ActualCostPrice > 0
-            THEN
-                v.ActualCostPrice * A.BaseRatio
-            ELSE BOCostPrice
-        END
-        FROM Characteristic C , A_ProductGroupBaseRatio A
-        WHERE
-            BOCostPrice is null
-            and C.BOMCode = #{bomCode}
-            AND C.ProductGroupCode = #{productGroupCode}
-            AND C.CharacteristicCode = v.CharacteristicCode
-            AND v.ProductGroupCode = C.ProductGroupCode
-            AND A.ProductGroupCode = #{productGroupCode}
-    </update>
-
-    <select id="getPriceAndOdInfo" resultType="cn.com.uitech.authorization.pojo.dto.PriceAndOdInfoDTO">
-        SELECT DISTINCT
-        *
-        FROM
-        standardbom sdb
-        LEFT JOIN a_productgroupcode apg ON sdb.productgroupcode = apg.productgroupcode
-        LEFT JOIN odproduct od ON sdb.productgroupcode = od.productgroupcode and sdb.bomcode = od.bomcode and od.producttype=1
-        LEFT JOIN odproductrelation odr ON odr.productgroupcode = od.productgroupcode and odr.bomcode = od.bomcode and odr.producttype=1
-        LEFT JOIN a_producthierarchy pph ON sdb.phid=pph.phid
-        LEFT JOIN price P ON sdb.priceid = P.priceid
-        LEFT JOIN pricecalexpression pps ON sdb.bomcode = pps.bomcode AND sdb.productgroupcode = pps.productgroupcode
-        LEFT JOIN standardbomext sbe ON sdb.bomcode = sbe.bomcode AND sdb.productgroupcode = sbe.productgroupcode
-        where sdb.productgroupcode=#{productGroupCode} and sdb.bomtypeid=#{bomTypeId} and sdb.phid=#{phId} and sdb.bomcode=#{bomCode}
-    </select>
-
-    <select id="getPhId" resultType="java.lang.Integer">
-        select phId from standardbom where bomCode=#{bomCode} and productGroupCode=#{productGroupCode}
-        UNION
-        select phId from configurablebom where bomCode=#{bomCode} and productGroupCode=#{productGroupCode}
-    </select>
-
-    <insert id="saveHistoryInfo">
-        INSERT INTO
-            pricehistory
-            (
-                salecostprice,
-                costsupportprice,
-                strictcontrolprice,
-                salesmanagerprice,
-                agentprice,
-                bocostprice,
-                actualcostprice,
-                isconfirmprice,
-                bomcode,
-                productgroupcode,
-                logcode,
-                updatetime
-            )
-
-        VALUES
-            (
-                #{saleCostPrice},
-                #{costSupportPrice},
-                #{strictControlPrice},
-                #{salesManagerPrice},
-                #{agentPrice},
-                #{boCostPrice},
-                #{actualCostPrice},
-                #{isConfirmPrice},
-                #{bomCode},
-                #{productGroupCode},
-                #{logCode},
-                now()
-            )
-    </insert>
-
-    <update id="updatePricecale">
-        UPDATE pricecalexpression
-            SET
-            salecostadjustmod = #{saleCostAdjustMod},
-            costsupportmod = #{costSupportMod},
-            strictcontrolmod = #{strictControlMod},
-            salesmanagermod = #{salesManagerMod}
-        WHERE
-            phid = #{phId}
-            AND producttype = #{productType}
-            AND bomcode = #{bomCode}
-            AND productgroupcode = #{productGroupCode}
-            AND pricetype = #{priceType}
-    </update>
-
-    <update id="updateValueModel">
-        UPDATE
-            characteristicvalue
-        SET
-            agentPrice = #{ agentPrice },
-            boCostPrice = #{ boCostPrice },
-            actualCostPrice = #{ actualCostPrice },
-            updatetime = now(),
-            priceId = #{priceId}
-        WHERE
-            productGroupCode = #{ productGroupCode } and characteristicvaluecode = #{ characteristicValueCode }
-    </update>
-</mapper>
\ No newline at end of file

src/main/resources/mapper/SuperBomSkuInfoMapper.xml

@@ -188,12 +188,20 @@
 
 <select id="getConfigInfos" resultType="java.lang.String">
     select
-        characteristic_Code || characteristic_Value_Code cvcode
-     from super_bom_sku_config_info where config_id  = #{configId}
+        characteristic_Code || characteristic_Value_Code || b.super_bom_code cvcode
+    from super_bom_sku_config_info a left join super_bom_sku_info b on a.config_id = b.config_id
+    where b.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 super_bom_sku_info set
+    apply_status = '未回号' ,
+    <if test="plmMsg!=null and plmMsg!=null">
+        plm_msg = #{plmMsg} ,
+    </if>
+    apply_user = #{applyUser} ,
+    apply_time  = now()
+    where config_id = #{configId}
     </update>
 
 <update id="updateSkuStatusH3c">

src/main/resources/mapper/UserInfoMapper.xml

@@ -6,4 +6,15 @@
 <select id="getUser" resultType="cn.com.uitech.authorization.pojo.entity.UserInfo">
     select * from user_info where user_code = #{userCode} and pass_word = #{password}
     </select>
+
+<select id="getUserDimension" resultType="cn.com.uitech.authorization.pojo.entity.MenuInfo">
+    SELECT
+        A.user_code,
+        b.menu_id,b.menu_name,b.menu_url,b.is_state,b.menu_code
+    FROM
+        user_menu_info
+        A LEFT JOIN menu_info b ON A.menu_id = b.menu_id
+    WHERE
+        A.user_code = #{userCode}
+    </select>
 </mapper>
\ No newline at end of file