FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source 
# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
This commit is contained in:
duanwenbin
2021-07-07 11:23:08 +08:00
parent 9709acf0a9 3c7acb2705
commit c1a0b31372
10 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class ActDefineStartMap {
map.put("2","standardSurveyWorkFlow");
map.put("3","standardCommentProcessWorkFlow");
map.put("3","standardregulatoryinventory");
map.put("4","standardregulatoryinventory");
return map.get(type);
}
}
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+1 -1
View File
@@ -213,7 +213,7 @@ public class WorkFlowController {
@ApiOperation(value = "完成任务")
@PostMapping("/completeTask")
public Wrapper<String> completeTaskByUserId(@RequestBody BusMes busMes){
public Wrapper<String> completeTaskByUserId( BusMes busMes){
Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
if(str.getCode() == 500){
str.setSuccess(false);
adc-da-main/src/main/resources/application-dev.properties
+14 -11
View File
@@ -3,20 +3,20 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = root
#==============================================
# 应用设置
spring.application.name=FotonLAWSSystem-zqazqazqa
spring.application.name=FotonLAWSSystem
application.code=20200101
application.center=1
#==============================================
#Eruept
eureka.client.allow-redirects=false
eureka.client.register-with-eureka=false
eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
#==============================================
# 邮箱配置1
@@ -35,13 +35,16 @@ spring.mail.port=587
# ==============================================
# rabbitMQ
# ==============================================
spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
spring.rabbitmq.port=5672
spring.rabbitmq.virtual-host=uat_pcms
spring.rabbitmq.username=uat_pcms
spring.rabbitmq.password=VxsBLL5bJruwzXfS
#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
#spring.rabbitmq.port=5672
#spring.rabbitmq.virtual-host=uat_pcms
#spring.rabbitmq.username=uat_pcms
#spring.rabbitmq.password=VxsBLL5bJruwzXfS
# spring.rabbitmq.publisher-confirms=true
spring.rabbitmq.host=192.168.10.248
spring.rabbitmq.port=5672
spring.rabbitmq.username=ca
spring.rabbitmq.password=cs986432
# ==============================================
# 文档存储路径指向
# ==============================================
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
+4 -3
View File
@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelDto;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -20,10 +21,10 @@ import java.util.List;
public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetailedList> {
//根据清单id，查出标准的id并排序
List<String> selectLawsId(String standId,Integer page,Integer size);
List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size);
//根据标准id查出数据
List<LittleLawsDto> selectLawsById(List<String> LawsIds,String standName);
List<LittleLawsDto> selectLawsById(@Param("param1") List<String> LawsIds,@Param("standName") String standName);
List<String> selectLawsId2(String standId);
Boolean insertList(List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists);
Boolean insertList(@Param("sarLawsAttrDetailedLists") List<SarLawsAttrDetailedList> sarLawsAttrDetailedLists);
Boolean deleteByStandId(String standId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java
+5 -1
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarLawsAttrDetailedList.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,16 +28,19 @@ public class SarLawsAttrDetailedList extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId
@TableField(value = "id")
private String id;
@ApiModelProperty(value = "标准政策表的id")
@TableField(value = "stand_id")
private String standId;
@ApiModelProperty(value = "标准清单主键")
@TableField(value = "detailed_list_id")
private String detailedListId;
@ApiModelProperty(value = "顺序")
@TableField(value = "number")
private String number;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class AddDetailedDto {
@ApiModelProperty(value = "上传的附件")
private MultipartFile[] files;
@ApiModelProperty(value = "要添加的清单id")
private String[] lawsIds;
private String inforlist;
public MultipartFile getFiles(int i) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class DetailedUpDto {
private String reNewPeople;
@ApiModelProperty(value = "要添加的清单id")
private String[] lawsIds;
private String inforlist;
@ApiModelProperty(value = "清单详情")
private String remark;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+38 -4
View File
@@ -9,6 +9,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto;
import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList;
import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto;
import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService;
import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,8 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* <p>
@@ -41,6 +41,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
@Autowired
private SarLawsAttrDetailedListServiceImpl service;
@Autowired
private IDicTypeEOService iDicTypeEOService;
@Override
public String del(List<String> idList) {
@@ -81,7 +83,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
break;
}
sarLawsDetailedListDao.insert(sarLawsDetailedList);
service.insertDetailedList(sarLawsDetailedList.getId(),addDetailedDto.getLawsIds());
addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1,addDetailedDto.getInforlist().length()-1));
String[] split = addDetailedDto.getInforlist().split(",");
service.insertDetailedList(sarLawsDetailedList.getId(),split);
} catch (Exception e) {
e.printStackTrace();
@@ -109,6 +113,34 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
wrapper.eq("sort_key",sortKey);
Page<SarLawsDetailedList> page = new Page<>(pages, size);
IPage<SarLawsDetailedList> userIPage = sarLawsDetailedListDao.selectPage(page, wrapper);
Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
List<SarLawsDetailedList> list= userIPage.getRecords();
List<Map<String, String>> arr = (List<Map<String, String>>)map.get("COUNTRY");
for (SarLawsDetailedList list1:list){
if (list1.getCountryArea().contains(",")){
String[] split = list1.getCountryArea().split(",");
StringBuilder builder = new StringBuilder();
for (String s:split){
for (Map<String,String> map1:arr) {
if (map1.get("value").equals(s)){
s=map1.get("label");
builder.append(s+",");
break;
}
}
}
String completedString = builder.delete(builder.length()-1,builder.length()).toString();
list1.setCountryArea(completedString);
}else {
for (Map<String,String> map1:arr) {
if (map1.get("value").equals(list1.getCountryArea())){
list1.setCountryArea(map1.get("label"));
break;
}
}
}
}
userIPage.setRecords(list);
System.out.println("总条数" + userIPage.getTotal());
System.out.println("总页数" + userIPage.getPages());
return userIPage;
@@ -158,7 +190,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
else list.setDetailedListState(detailedUpDto.getDetailedListState());
sarLawsDetailedListDao.updateById(list);
service.updateDetailedLaws(detailedUpDto.getId(), detailedUpDto.getLawsIds());
detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1,detailedUpDto.getInforlist().length()-1));
String[] split = detailedUpDto.getInforlist().split(",");
service.updateDetailedLaws(detailedUpDto.getId(), split);
return "修改成功";
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+4 -2
View File
@@ -33,7 +33,7 @@
</if>
</where>
order by number
LIMIT #{param3} OFFSET #{param2};
LIMIT #{param3} , #{param2};
</select>
<select id="selectLawsId2" resultType="string">
@@ -45,12 +45,14 @@
</where>
order by number
</select>
<insert id="insertList">
INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES
<foreach collection ="list" item="list" separator =",">
<foreach collection ="sarLawsAttrDetailedLists" item="list" separator =",">
(#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR})
</foreach >
</insert>
<delete id="deleteByStandId">
delete from sar_laws_attr_detailed_list where detailed_list_id=#{standId,jdbcType=VARCHAR}
</delete>
adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
+1 -1
View File
@@ -35,7 +35,7 @@
</update>
<select id="existTable" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(*) from information_schema.tables where table_name = #{tableName}
select count(*) from information_schema.TABLES where table_name = #{tableName}
</select>
<!-- 查询条件 -->