diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java new file mode 100644 index 00000000..9a1d426f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java @@ -0,0 +1,58 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.controller; + + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-20 +*/ +@RestController +@Api(tags = "福田标准法规--企业标准关联国内外标准信息") +@RequestMapping("/${restPath}/lawss/SarBussStandAttrInfo") +public class SarBussStandAttrInfoController extends BaseController { + + @Autowired + private ISarBussStandAttrInfoService sarBussStandAttrInfoEOService; + + @ApiOperation(value = "|SarBussStandAttrInfoEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:page") + public ResponseMessage> page(SarBussStandAttrInfoEOPage page) throws Exception { + List rows = sarBussStandAttrInfoEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarBussStandAttrInfoEO|查询") + @GetMapping("") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:list") + public ResponseMessage> list(SarBussStandAttrInfoEOPage page) throws Exception { + return Result.success(sarBussStandAttrInfoEOService.queryByList(page)); + } + + @ApiOperation(value = "|SarBussStandAttrInfoEO|新增") + @PostMapping(consumes = "application/json;charset=UTF-8") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:save") + public ResponseMessage create(@RequestBody SarBussStandAttrInfo sarBussStandAttrInfoEO) throws Exception { + sarBussStandAttrInfoEOService.insertSelective(sarBussStandAttrInfoEO); + return Result.success(sarBussStandAttrInfoEO); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java new file mode 100644 index 00000000..3be1eb92 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.dao; + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +@Repository +public interface SarBussStandAttrInfoDao extends BaseMapper { + + List queryByList(SarBussStandAttrInfoEOPage page); + + List queryByPage(SarBussStandAttrInfoEOPage page); + + int insertSelective(SarBussStandAttrInfo sarBussStandAttrInfo); + + Map selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java new file mode 100644 index 00000000..b0019e1d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfo.java @@ -0,0 +1,111 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussStandAttrInfo对象", description="") +public class SarBussStandAttrInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableField("ID") + private String id; + + @ApiModelProperty(value = "标准基础表主键") + @TableField("STAND_ID") + private String standId; + + @TableField("CREATION_USER") + private String creationUser; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private String validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; +// +// @TableField("SVPPS") +// private String svpps; +// +// @TableField("GFXYYWJ") +// private String gfxyywj; +// +// @TableField("ZRBM") +// private String zrbm; +// +// @TableField("FZRQ") +// private Date fzrq; +// +// @TableField("FSRQ") +// private Date fsrq; +// +// @TableField("QBMJ") +// private String qbmj; +// +// @TableField("QBSQ") +// private String qbsq; +// +// @TableField("QBWB") +// private String qbwb; +// +// @TableField("GCWB") +// private String gcwb; +// +// @TableField("ZYQCR") +// private String zyqcr; +// +// @TableField("QCFBW") +// private String qcfbw; +// +// @TableField("XGLC") +// private String xglc; +// +// @TableField("XGBM") +// private String xgbm; +// +// @TableField("XHQBM") +// private String xhqbm; +// +// @TableField("ZQCBM") +// private String zqcbm; +// +// @TableField("QTQCR") +// private String qtqcr; +// +// @TableField("WFSPJS") +// private String wfspjs; +// +// @TableField("XGJH") +// private String xgjh; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoEOPage.java new file mode 100644 index 00000000..94462e48 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoEOPage.java @@ -0,0 +1,158 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.entity; + +import com.adc.da.base.page.BasePage; + +/** + * 功能：SAR_BUSS_STAND_ATTR_INFO SarBussStandAttrInfoEOPage
+ * 作者：code generator
+ * 日期： 2020-10-27
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarBussStandAttrInfoEOPage extends BasePage { + + private String id; + private String idOperator = "="; + private String standId; + private String standIdOperator = "="; + private String creationUser; + private String creationUserOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + public String getStandId() { + return this.standId; + } + + public void setStandId(String standId) { + this.standId = standId; + } + + public String getStandIdOperator() { + return this.standIdOperator; + } + + public void setStandIdOperator(String standIdOperator) { + this.standIdOperator = standIdOperator; + } + + public String getCreationUser() { + return this.creationUser; + } + + public void setCreationUser(String creationUser) { + this.creationUser = creationUser; + } + + public String getCreationUserOperator() { + return this.creationUserOperator; + } + + public void setCreationUserOperator(String creationUserOperator) { + this.creationUserOperator = creationUserOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java new file mode 100644 index 00000000..b34a1f17 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java @@ -0,0 +1,24 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.service; + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +public interface ISarBussStandAttrInfoService extends IService { + + List queryByList(SarBussStandAttrInfoEOPage page); + + List queryByPage(SarBussStandAttrInfoEOPage page); + + int insertSelective(SarBussStandAttrInfo sarBussStandAttrInfo); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java new file mode 100644 index 00000000..3bc28e05 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java @@ -0,0 +1,37 @@ +package com.adc.da.slrs.sarBussStandAttrInfo.service.impl; + +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-20 + */ +@Service +public class SarBussStandAttrInfoServiceImpl extends ServiceImpl implements ISarBussStandAttrInfoService { + + @Override + public List queryByList(SarBussStandAttrInfoEOPage page){ + return this.baseMapper.queryByList(page); + } + + @Override + public List queryByPage(SarBussStandAttrInfoEOPage page){ + return this.baseMapper.queryByPage(page); + } + + @Override + public int insertSelective(SarBussStandAttrInfo sarBussStandAttrInfo){ + return this.baseMapper.insertSelective(sarBussStandAttrInfo); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index dc247155..893c0ca1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,12 +1,28 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.sys.util.LoginUserUtil; +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.util.utils.StringUtils; +import com.adc.da.utils.util.SarAdvanceSearchUtil; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 企业标准信息表 前端控制器 @@ -20,4 +36,48 @@ import com.adc.da.base.web.BaseController; @RequestMapping("/${restPath}/lawss/sarBussionessStand") public class SarBussionessStandController extends BaseController { + @Autowired + private ISarBussionessStandService sarBussionessStandEOService; + + @Autowired + private ITsResourceService iTsResourceService; + + /** + * 自定义分页查询列表 + * @param page 标准信息 + * @return + * @author gaoyan + * date 2018-09-04 + */ + @ApiOperation(value = "|SarBussionessStandEO|自定义分页查询列表") + @GetMapping("/getSarBussionStandPage") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + page.setUserId(LoginUserUtil.getUserId()); + if(StringUtils.isNotBlank(page.getPaixu())){ + String sql = page.getPaixu()+" "+page.getShunxu(); + page.setSql(sql); + }else{ + page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id"); + } + List getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId()); + if(getMenuIdList != null && !getMenuIdList.isEmpty()){ + page.setMenuRoleList(getMenuIdList); + List rows = sarBussionessStandEOService.getSarBussionStandPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } else { + return Result.success(getPageInfo(page.getPager(), null)); + } + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 782a06da..621d3f1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.dao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; import java.util.List; @@ -14,7 +15,13 @@ import java.util.List; * @author super_liu * @since 2021-07-13 */ +@Repository public interface SarBussionessStandDao extends BaseMapper { List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); + + int getBussionessStandInfoCount(SarBussionessStandEOPage page); + + List getBussionessStandInfoPage(SarBussionessStandEOPage page); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 3277b429..3bb4f2ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -17,4 +17,6 @@ import java.util.List; public interface ISarBussionessStandService extends IService { List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); + + List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index bc23039e..d9c6c3ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1,13 +1,28 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; +import com.adc.da.common.SelectionTypeEnum; +import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.utils.util.FieldConvertUtil; +import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.sql.Clob; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -20,6 +35,110 @@ import java.util.List; @Service public class SarBussionessStandServiceImpl extends ServiceImpl implements ISarBussionessStandService { + @Autowired + private ITsUserService tsUserService; + + @Autowired + private ITsResourceService iTsResourceService; + + + @Autowired + private SysInfoEOService sysInfoEOService; + + @Autowired + private IPersonCollectEOService personCollectEOService; + + @Autowired + private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + + + @Override + public List getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception { + if (StringUtils.isNotBlank(page.getMenuId())) { + List getMenuIdList = tsUserService.getResourceId(new TsResource()); +// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); + if (getMenuIdList != null && !getMenuIdList.isEmpty()) { + page.setMenuRoleList(getMenuIdList); + } else { + page.setMenuRoleList(null); + } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page); + page.getPager().setRowCount(rowCount); + List sarlist = this.baseMapper.getBussionessStandInfoPage(page); + attrInfo(sarlist); + return sarlist; + } + + /*** + * @Description: 处理属性表数据 + * @Param: [sarlist] + * @Return: void + */ + public void attrInfo (List sarlist) throws Exception { + for(SarBussionessStand row : sarlist){ + attrInfoDetails(row); + } + } + + public void attrInfoDetails (SarBussionessStand row) throws Exception { + String fieldInfo = InitStandAttrUtil.queryFieldBuss; + String collectId = personCollectEOService.queryCollectByUserAndId(row.getId()); + row.setCollectId(collectId); + // 查询属性表数据 + if (StringUtils.isNotBlank(fieldInfo)) { + Map getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId()); + if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { + // 遍历修改所有clob类型的值 + for (String clobField : InitStandAttrUtil.clobFieldListBuss) { + Clob clobValue = (Clob) getAttrMap.get(clobField); + String fieldValue = FieldConvertUtil.ClobToString(clobValue); + getAttrMap.put(clobField,fieldValue); + } + } + // 组织机构和人员 + Map newMap = new HashMap<>(); + if(getAttrMap != null){ + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + Object value1 = entry.getValue(); + if (value1 != null && value1.toString().equals("\"null\"")){ + entry.setValue(""); + } + if ("SVPPS".equals(name)) { + Object value = entry.getValue(); + if (value != null && StringUtils.isNotBlank(value.toString())) { + value = sysInfoEOService.getSvppsNamesByIds(value.toString()); + } + newMap.put(name + "Name",value); + } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { + String value = entry.getValue().toString(); + String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); + if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getOrgNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) { + value = sysInfoEOService.getUserNamesByIds(value); + newMap.put(name + "Name",value); + } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { + value = sysInfoEOService.getRoleNamesByIds(value); + newMap.put(name + "Name",value); + } + } + } + getAttrMap.putAll(newMap); + } + + row.setAttrInfoMap(getAttrMap); + } + } + + + @Override public List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){ return this.baseMapper.queryByList(sarBussionessStandEOPage); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index 7b10eccb..15b389c8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -31,10 +31,19 @@ public class SarModelTreeController extends BaseController { @Autowired private ISarModelTreeService iSarModelTreeService; - @ApiOperation("查询所有资源") + @ApiOperation("查询父所有资源") @GetMapping("/list") public ResponseMessage> getAll(SarModelTree sarVppsTree){ List tsResources = iSarModelTreeService.getAll(sarVppsTree); return Result.success(tsResources); } + + @ApiOperation("根据父ID查询子所有资源") + @GetMapping("/childByList") + public ResponseMessage> childByList(String ids){ + SarModelTree tree = new SarModelTree(); + tree.setId(ids); + List tsResources = iSarModelTreeService.recursionGetChildren(tree); + return Result.success(tsResources); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java index b1d2c3f3..e17248c0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarModelTree.service; import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -17,4 +18,5 @@ public interface ISarModelTreeService extends IService { List getAll(SarModelTree sarModelTree); + List recursionGetChildren(SarModelTree parent); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index e3e3c907..a9703566 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -29,9 +29,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl tsResourceQueryWrapper=new QueryWrapper<>(); tsResourceQueryWrapper.isNull("PID"); List list = this.baseMapper.selectList(tsResourceQueryWrapper); - for(SarModelTree tree:list){ - tree.setChildren(recursionGetChildren((tree))); - } +// for(SarModelTree tree:list){ +// tree.setChildren(recursionGetChildren((tree))); +// } return list; } @@ -40,10 +40,11 @@ public class SarModelTreeServiceImpl extends ServiceImpl */ - private List recursionGetChildren(SarModelTree parent){ + @Override + public List recursionGetChildren(SarModelTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.eq("PID",parent.getId()); + sarMenuQueryWrapper.in("PID",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); for(SarModelTree sarMenu:children){ sarMenu.setChildren(recursionGetChildren((sarMenu))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java index 9f78cba2..ccd79b39 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -31,11 +31,22 @@ public class SarVppsTreeController extends BaseController { @Autowired private ISarVppsTreeService iSarVppsTreeService; - @ApiOperation("查询所有资源") + @ApiOperation("查询父所有资源") @GetMapping("/list") public ResponseMessage> getAll(SarVppsTree sarVppsTree){ List tsResources = iSarVppsTreeService.getAll(sarVppsTree); return Result.success(tsResources); } + @ApiOperation("根据父ID查询子所有资源") + @GetMapping("/childByList") + public ResponseMessage> childByList(String ids){ + SarVppsTree tree = new SarVppsTree(); + tree.setId(ids); + List tsResources = iSarVppsTreeService.recursionGetChildren(tree); + return Result.success(tsResources); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java index 910b46ec..77fb0689 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java @@ -16,4 +16,6 @@ import java.util.List; public interface ISarVppsTreeService extends IService { List getAll(SarVppsTree sarVppsTree); + + List recursionGetChildren(SarVppsTree parent); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index 1a7b51d4..32c8c76d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -29,9 +29,9 @@ public class SarVppsTreeServiceImpl extends ServiceImpl tsResourceQueryWrapper=new QueryWrapper<>(); tsResourceQueryWrapper.isNull("PID"); List list = this.baseMapper.selectList(tsResourceQueryWrapper); - for(SarVppsTree tree:list){ - tree.setChildren(recursionGetChildren((tree))); - } +// for(SarVppsTree tree:list){ +// tree.setChildren(recursionGetChildren((tree))); +// } return list; } @@ -40,10 +40,11 @@ public class SarVppsTreeServiceImpl extends ServiceImpl */ - private List recursionGetChildren(SarVppsTree parent){ + @Override + public List recursionGetChildren(SarVppsTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.eq("PID",parent.getId()); + sarMenuQueryWrapper.in("PID",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); for(SarVppsTree sarMenu:children){ sarMenu.setChildren(recursionGetChildren((sarMenu))); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml new file mode 100644 index 00000000..1e4eafe9 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + id, stand_id, creation_user, valid_flag, creation_time, modify_time + + + + + where 1=1 + + + and id ${idOperator} #{id} + + + and stand_id ${standIdOperator} #{standId} + + + and creation_user ${creationUserOperator} #{creationUser} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + + + + + insert into SAR_BUSS_STAND_ATTR_INFO() + values (#{id, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + insert into SAR_BUSS_STAND_ATTR_INFO + + id, + stand_id, + creation_user, + valid_flag, + creation_time, + modify_time, + + + #{id, jdbcType=VARCHAR}, + #{standId, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + + + + + + + + + + + + + + alter table SAR_BUSS_STAND_ATTR_INFO + add ${fieldInfo} + + + + + alter table SAR_BUSS_STAND_ATTR_INFO + drop COLUMN ${fieldInfo} + + + + + + + + ALTER table SAR_BUSS_STAND_ATTR_INFO + MODIFY ${fieldInfo} + + + + + + + insert into SAR_BUSS_STAND_ATTR_INFO(${fieldInfo}) + values (${fieldValue}) + + + + delete from SAR_BUSS_STAND_ATTR_INFO + where stand_id = #{standId} + + + + update SAR_BUSS_STAND_ATTR_INFO set ${field}=#{value} + where stand_id = #{standId} + + + + \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index c720ea6e..600d4d9b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -77,11 +77,10 @@ public class PersonCollectEOController extends BaseController { @ApiOperation(value = "|PersonCollectEO|新增") @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) // @RequiresPermissions("person:personCollect:create") - public ResponseMessage create(@RequestBody TsPersonCollect tsPersonCollect,String userId) throws Exception { + public ResponseMessage create(@RequestBody TsPersonCollect tsPersonCollect) throws Exception { // String userId = LoginUserUtil.getUserId(); tsPersonCollect.setId(UUIDUtils.randomUUID20()); - tsPersonCollect.setUserId(userId); tsPersonCollect.setValidFlag(0); tsPersonCollect.setCreationTime(new Date()); tsPersonCollect.setModifyTime(new Date()); @@ -123,6 +122,13 @@ public class PersonCollectEOController extends BaseController { * @Param [personCollectEO] * @return com.adc.da.util.http.ResponseMessage **/ + + /** + * 通过收藏的id和userId确定修改的数据 + * @param tsPersonCollect + * @return + * @throws Exception + */ @ApiOperation(value = "取消收藏") @PutMapping("/updateByUserId") // @RequiresPermissions("person:personCollect:updateByUserId") PersonCollectEO