Skip to content

C
config-server-api
Commit 510171ef by zxn
Options

修改页面展示名称

parent 0fa55d9a
Showing with 46 additions and 42 deletions
src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java
package cn.com.uitech.authorization.controller;
import cn.com.uitech.authorization.mapper.SuperTableInfoMapper;
import cn.com.uitech.authorization.pojo.dto.*;
import cn.com.uitech.authorization.pojo.entity.*;
import cn.com.uitech.authorization.service.IntegrateService;
import cn.com.uitech.authorization.utils.CrmResponseEntity;
import cn.com.uitech.authorization.utils.RedisHelper;
import cn.com.uitech.authorization.utils.RedisKey;
import cn.com.uitech.authorization.utils.ResultGenerator;
import com.alibaba.fastjson.JSON;
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.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.Errors;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.util.*;
import cn.com.uitech.authorization.mapper.SuperTableInfoMapper;
import cn.com.uitech.authorization.pojo.dto.*;
import cn.com.uitech.authorization.pojo.entity.*;
import cn.com.uitech.authorization.service.IntegrateService;
import cn.com.uitech.authorization.utils.CrmResponseEntity;
import cn.com.uitech.authorization.utils.RedisHelper;
import cn.com.uitech.authorization.utils.RedisKey;
import cn.com.uitech.authorization.utils.ResultGenerator;
import com.alibaba.fastjson.JSON;
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.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.Errors;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.util.*;
@RestController
@RequestMapping("/integrate")
@Api(tags = "integrate 集成接口")
......@@ -122,12 +126,12 @@ public class IntegrateController {
configurableBom.getCharacteristicList().forEach(characteristic -> {
// 封装部件信息
HashMap<String, Object> characteristicMap = new HashMap<>();
characteristicMap.put("name", characteristic.getUnisSalesCName());
characteristicMap.put("name", characteristic.getCharacteristicName());
// 封装配件信息
List<Map<String, Object>> values = new ArrayList<>();
characteristic.getCharacteristicValueList().forEach(characteristicValue -> {
HashMap<String, Object> characteristicValueMap = new HashMap<>();
characteristicValueMap.put("name", characteristicValue.getUnisSalesVName());
characteristicValueMap.put("name", characteristicValue.getCharacteristicValueName());
values.add(characteristicValueMap);
});
characteristicMap.put("values", values);
......@@ -157,9 +161,9 @@ public class IntegrateController {
String characteristicValueName = (String) item.get("characteristicValueName");
CharacteristicValue characteristicValue = integrateService.findByCharacteristicValueName(characteristic.getCharacteristicCode(),characteristicValueName, selectorEntity.getSuperBomCode());
selectedValue.put("characteristicCode", characteristic.getCharacteristicCode());
selectedValue.put("characteristicName", characteristic.getUnisSalesCName());
selectedValue.put("characteristicName", characteristic.getCharacteristicName());
selectedValue.put("characteristicValueCode", characteristicValue.getCharacteristicValueCode());
selectedValue.put("characteristicValueName", characteristicValue.getUnisSalesVName());
selectedValue.put("characteristicValueName", characteristicValue.getCharacteristicValueName());
selectedValue.put("qualifyDate", characteristicValue.getQualifyDate());
selectedValue.put("characteristicType", characteristic.getCharacteristicType());
selectedValueList.add(selectedValue);
......@@ -256,7 +260,7 @@ public class IntegrateController {
@PostMapping("/getConfigurations")
@ApiOperation(value = "根据configId获取配置", notes = "getConfigurations", httpMethod = "POST")
public Object getConfigurations(@RequestBody GetConfigurationInputDTO getConfigurationInputDTO,
Errors errors) {
Errors errors) {
return integrateService.getConfigInfo(getConfigurationInputDTO);
}
......
src/main/resources/mapper/CharacteristicValueMapper.xml
......@@ -66,14 +66,14 @@
<update id="editCharacteristicValue" parameterType="cn.com.uitech.authorization.pojo.entity.CharacteristicValue">
UPDATE super_characteristic_value_info
set
characteristic_Value_name=#{characteristicValueName},
is_state=#{isState},
is_Show=#{isShow},
zph_code=#{zphCode},
zph_name=#{zphName},
qualify_date=#{qualifyDate},
unis_sales_v_name=#{unisSalesVName},
h3c_c_value=#{h3cCValue}
characteristic_Value_name=#{characteristicValueName},
is_state=#{isState},
is_Show=#{isShow},
zph_code=#{zphCode},
zph_name=#{zphName},
qualify_date=#{qualifyDate},
unis_sales_v_name=#{unisSalesVName},
h3c_c_value=#{h3cCValue}
<where>
<if test="characteristicValueCode!=null and characteristicValueCode.length>0">
Characteristic_Value_Code=#{characteristicValueCode}
......@@ -282,7 +282,7 @@
</insert>
<select id="findByCharacteristicValueName" resultType="cn.com.uitech.authorization.pojo.entity.CharacteristicValue">
select * from super_characteristic_value_info where characteristic_code = #{characteristicName} and unis_sales_v_name = #{characteristicValueName} and super_bom_code = #{superBomCode}
select * from super_characteristic_value_info where characteristic_code = #{characteristicName} and characteristic_value_name = #{characteristicValueName} and super_bom_code = #{superBomCode}
</select>
<select id="getName" resultType="java.lang.String">
......@@ -302,9 +302,9 @@
resultType="cn.com.uitech.authorization.pojo.entity.CharacteristicValue">
select * from super_characteristic_value_info a
left join super_characteristic_info b on a.characteristic_code = b.characteristic_code
where unis_sales_v_name = #{characteristicValueName}
where characteristic_value_name = #{characteristicValueName}
and a.super_bom_code = #{superBomCode}
and b.unis_sales_c_name= #{characteristicName}
and b.characteristic_name= #{characteristicName}
</select>
<select id="getCharacteristicValueInfoByCode"
......
src/main/resources/mapper/SuperTableInfoMapper.xml
......@@ -65,9 +65,9 @@
select distinct group_number groupnumber from super_table_item_info where table_number = #{tablenumber}
</select>
<select id="findCName" resultType="map">
select distinct c.characteristic_code characteristiccode,c.unis_sales_c_name characteristicname from super_table_item_info b left join super_characteristic_info c on b.characteristic_code = c.characteristic_code where b.table_number =#{tablenumber} and b.group_number = #{groupNumber}
select distinct c.characteristic_code characteristiccode,c.characteristic_name characteristicname from super_table_item_info b left join super_characteristic_info c on b.characteristic_code = c.characteristic_code where b.table_number =#{tablenumber} and b.group_number = #{groupNumber}
</select>
<select id="findVName" resultType="java.lang.String">
select distinct COALESCE(d.unis_sales_v_name,'None') from super_table_item_info b left join super_characteristic_value_info d on b.characteristic_value_code = d.characteristic_value_code where b.table_number =#{tablenumber} and b.group_number = #{groupNumber} and b.characteristic_code = #{characteristiccode}
select distinct COALESCE(d.characteristic_value_name,'None') from super_table_item_info b left join super_characteristic_value_info d on b.characteristic_value_code = d.characteristic_value_code where b.table_number =#{tablenumber} and b.group_number = #{groupNumber} and b.characteristic_code = #{characteristiccode}
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment