diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java index c4faef80..45d6b1df 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java @@ -14,6 +14,15 @@ public enum HandleEnum { /**车间作业控制*/ SFC( "SFCBO:", "SFCBO:{0},{1}" ), + /**zhaungtai**/ + STATUS("StatusBO:", "StatusBO:{0},{1}"), + + /**zhaungtai**/ + RESOURCE_TYPE("ResourceTypeBO:", "ResourceTypeBO:{0},{1}"), + + /****/ + RESOURCE_TYPE_RESOURCEBO("ResourceTypeResourceBO","ResourceTypeResourceBO:{0},{1}"), + /**车间作业控制*/ SFC_BOM( "SFCBOMBO:", "SFCBOMBO:{0}" ), diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/controller/EmailGroupController.class b/equip/target/classes/com/foreverwin/mesnac/equip/controller/EmailGroupController.class deleted file mode 100644 index 045778a2..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/controller/EmailGroupController.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/controller/EquipController.class b/equip/target/classes/com/foreverwin/mesnac/equip/controller/EquipController.class deleted file mode 100644 index bdd7071d..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/controller/EquipController.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/controller/EquipTypeController.class b/equip/target/classes/com/foreverwin/mesnac/equip/controller/EquipTypeController.class deleted file mode 100644 index 5d759e50..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/controller/EquipTypeController.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EmailGroupMapper.class b/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EmailGroupMapper.class deleted file mode 100644 index 62dd2d5f..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EmailGroupMapper.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipMapper.class b/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipMapper.class deleted file mode 100644 index 966ed8eb..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipMapper.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipTypeEquipMapper.class b/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipTypeEquipMapper.class deleted file mode 100644 index abbad7fc..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipTypeEquipMapper.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipTypeMapper.class b/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipTypeMapper.class deleted file mode 100644 index fc7ff8c8..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/mapper/EquipTypeMapper.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/model/EmailGroup.class b/equip/target/classes/com/foreverwin/mesnac/equip/model/EmailGroup.class deleted file mode 100644 index 1afcb874..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/model/EmailGroup.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/model/Equip.class b/equip/target/classes/com/foreverwin/mesnac/equip/model/Equip.class deleted file mode 100644 index fec8d6a4..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/model/Equip.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/model/EquipType.class b/equip/target/classes/com/foreverwin/mesnac/equip/model/EquipType.class deleted file mode 100644 index b974fabe..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/model/EquipType.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/model/EquipTypeEquip.class b/equip/target/classes/com/foreverwin/mesnac/equip/model/EquipTypeEquip.class deleted file mode 100644 index bcfb2625..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/model/EquipTypeEquip.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/EmailGroupService.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/EmailGroupService.class deleted file mode 100644 index 4c3d13d9..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/EmailGroupService.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipService.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipService.class deleted file mode 100644 index d672721b..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipService.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipTypeEquipService.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipTypeEquipService.class deleted file mode 100644 index fe32f1ba..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipTypeEquipService.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipTypeService.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipTypeService.class deleted file mode 100644 index c43a9dca..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/EquipTypeService.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.class deleted file mode 100644 index 6b3361d8..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EmailGroupServiceImpl.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipServiceImpl.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipServiceImpl.class deleted file mode 100644 index 20ee9933..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipServiceImpl.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipTypeEquipServiceImpl.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipTypeEquipServiceImpl.class deleted file mode 100644 index ef77fb94..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipTypeEquipServiceImpl.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipTypeServiceImpl.class b/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipTypeServiceImpl.class deleted file mode 100644 index a2c5dba8..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/service/impl/EquipTypeServiceImpl.class and /dev/null differ diff --git a/equip/target/classes/com/foreverwin/mesnac/equip/util/ConstantUtil.class b/equip/target/classes/com/foreverwin/mesnac/equip/util/ConstantUtil.class deleted file mode 100644 index 21d7d850..00000000 Binary files a/equip/target/classes/com/foreverwin/mesnac/equip/util/ConstantUtil.class and /dev/null differ diff --git a/equip/target/classes/mapper/EquipMapper.xml b/equip/target/classes/mapper/EquipMapper.xml deleted file mode 100644 index 6ea4284d..00000000 --- a/equip/target/classes/mapper/EquipMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java index 38313fb2..6b023582 100644 --- a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java +++ b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java @@ -20,22 +20,22 @@ public class GeneratorApplication { DataSourceConfig dataSourceConfig = new DataSourceConfig(); dataSourceConfig.setDbType( DbType.ORACLE ); - dataSourceConfig.setDriverName( "com.sap.db.jdbc.Driver" ); + /*dataSourceConfig.setDriverName( "com.sap.db.jdbc.Driver" ); dataSourceConfig.setUrl( "jdbc:sap:10.18.8.21:30122" ); dataSourceConfig.setUsername( "wip" ); dataSourceConfig.setPassword( "Minth@2020" ); dataSourceConfig.setDbQuery( new HanaQuery() ); - dataSourceConfig.setTypeConvert( new HanaTypeConvert() ); - /*dataSourceConfig.setDriverName( "oracle.jdbc.OracleDriver" ); + dataSourceConfig.setTypeConvert( new HanaTypeConvert() );*/ + dataSourceConfig.setDriverName( "oracle.jdbc.OracleDriver" ); dataSourceConfig.setUrl( "jdbc:oracle:thin:@113.98.201.217:1521:ORD" ); dataSourceConfig.setUsername( "WIP" ); dataSourceConfig.setPassword( "wip" ); - dataSourceConfig.setTypeConvert( new OracleTypeConvert() );*/ + dataSourceConfig.setTypeConvert( new OracleTypeConvert() ); MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig) .tablePrefix( "APS_", "DS_", "Z_" ) - .packageName( "com.foreverwin.minth.production" ) - .tables("Z_PLATING_LOAD_UP_SN") - .author("Faramita Zhao") + .packageName( "com.foreverwin.mesnac.meapi" ) + .tables("CUSTOM_FIELDS") + .author("LZP") .uiAppId("com.foreverwin.me") .uiPackage("com.foreverwin.me.migration") .build(); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/CustomFieldsController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/CustomFieldsController.java new file mode 100644 index 00000000..9f7bf116 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/CustomFieldsController.java @@ -0,0 +1,120 @@ +package com.foreverwin.mesnac.meapi.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.meapi.service.CustomFieldsService; +import com.foreverwin.mesnac.meapi.model.CustomFields; +import java.util.List; + +/** + * + * @author LZP + * @since 2021-06-01 + */ +@RestController +@RequestMapping("/CUSTOM-FIELDS") +public class CustomFieldsController { + + @Autowired + public CustomFieldsService customFieldsService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getCustomFieldsById(@PathVariable String id) { + return R.ok( customFieldsService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getCustomFieldsList(CustomFields customFields){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(customFields); + result = customFieldsService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, CustomFields customFields){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(customFields); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(CustomFields::getHandle, frontPage.getGlobalQuery()) + .or().like(CustomFields::getAttribute, frontPage.getGlobalQuery()) + .or().like(CustomFields::getValue, frontPage.getGlobalQuery()) + ); + } + result = customFieldsService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param customFields 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody CustomFields customFields) { + return R.ok(customFieldsService.save(customFields)); + } + + /** + * 修改 + * @param customFields 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody CustomFields customFields) { + return R.ok(customFieldsService.updateById(customFields)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(customFieldsService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(customFieldsService.removeByIds(ids)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/CustomFieldsMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/CustomFieldsMapper.java new file mode 100644 index 00000000..602140a8 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/CustomFieldsMapper.java @@ -0,0 +1,45 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.CustomFields; +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 LZP + * @since 2021-06-01 + */ +@Repository +public interface CustomFieldsMapper extends BaseMapper { + + String selectCustomFieldsValue(@Param("handle") String handle, + @Param("attribute") String attribute); + + List selectCustomFieldsByHandle(@Param("handle") String handle); + + List selectCustomFields(@Param("handle") String handle, + @Param("attribute") String attribute); + + List> selectEquipType(@Param("site") String site, + @Param("equipType") String equipType); + Map getCustom(@Param("handle") String handle, @Param("attr") String attr); + List> getCustoms(@Param("handles") List handles, @Param("attr") String attr); + + Map selectItemGroupPrintTemplate(@Param("sfcBo") String sfcBo); + Map selectItemGroupPrintTemplateByItemBo(@Param("itemBo") String itemBo); + + void setCustom(@Param("handle") String handle, @Param("attribute") String attribute, @Param("value") String value); + + void clearCustom(@Param("handle") String handle, @Param("attr") String attr); + + String selectWidthValue(@Param("site") String site, @Param("itemBo") String itemBo); + + String selectAttributeByItemBo(@Param("itemBo") String shopOrder); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java new file mode 100644 index 00000000..5240aa79 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/CustomFields.java @@ -0,0 +1,106 @@ +package com.foreverwin.mesnac.meapi.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * + *

+ * + * @author LZP + * @since 2021-06-01 + */ + +@TableName("CUSTOM_FIELDS") + +public class CustomFields extends Model { + + private static final long serialVersionUID = 1L; + + @TableField("HANDLE") + private String handle; + @TableField("ATTRIBUTE") + private String attribute; + @TableField("VALUE") + private String value; + @TableField("CREATED_DATE_TIME") + private Date createdDateTime; + @TableField("MODIFIED_DATE_TIME") + private Date modifiedDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public Date getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(Date createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public Date getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(Date modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String ATTRIBUTE = "ATTRIBUTE"; + +public static final String VALUE = "VALUE"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "CustomFields{" + + "handle = " + handle + + ", attribute = " + attribute + + ", value = " + value + + ", createdDateTime = " + createdDateTime + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/CustomFieldsService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/CustomFieldsService.java new file mode 100644 index 00000000..1e88d5a4 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/CustomFieldsService.java @@ -0,0 +1,104 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.CustomFields; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author LZP + * @since 2021-06-01 + */ +public interface CustomFieldsService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, CustomFields customFields); + + List selectList(CustomFields customFields); + + + /** + * 查找自定义数据 + * @param customFields + * @return + */ + CustomFields selectOne(CustomFields customFields); + + /** + * @Author zero + * 查询自定义数据 + * @return + */ + String getCustomFieldsValue(String handle, String attribute); + + /** + * 查询机型 + * @param site + * @param resourceType + * @return + */ + List> getEquipType(String site, String resourceType); + + /** + * @Author zero + * 查询自定义数据 + * @param handle 必需 + * @param attribute 非必需 + * @return + */ + List getCustomFields(String handle, String attribute); + + /** + * 查找自定义数据 + * @param handle + * @return + */ + List getCustomFieldsByHandle(String handle); + + @Transactional(propagation = Propagation.REQUIRES_NEW) + void setCustomWithNewTransaction(String handle, String attribute, String value); + + /** + * 更改自定义数据 + * @param handle + * @param attribute + * @param value + */ + void setCustom(String handle, String attribute, String value); + + /** + * 查询物料组维护的打印模板 + * @param sfcBo + * @return + */ + Map getItemGroupPrintTemplate(String sfcBo); + + /** + * 查询物料组维护的打印模板 + * @param itemBo + * @return + */ + Map getItemGroupPrintTemplateByItemBo(String itemBo); + + /** + * 查询分条前物料的宽度 + * @param itemBo + * @return + */ + String selectWidthValue(String site, String itemBo); + + String selectAttributeByItemBo(String itemBo); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/CustomFieldsServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/CustomFieldsServiceImpl.java new file mode 100644 index 00000000..b988e841 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/CustomFieldsServiceImpl.java @@ -0,0 +1,135 @@ +package com.foreverwin.mesnac.meapi.service.impl; + +import com.foreverwin.modular.core.util.FrontPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.CustomFields; +import com.foreverwin.mesnac.meapi.mapper.CustomFieldsMapper; +import com.foreverwin.mesnac.meapi.service.CustomFieldsService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author LZP + * @since 2021-06-01 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class CustomFieldsServiceImpl extends ServiceImpl implements CustomFieldsService { + + private static Logger logger = LogManager.getLogger(CustomFieldsServiceImpl.class); + + @Autowired + private CustomFieldsMapper customFieldsMapper; + + @Autowired + private CustomFieldsService customFieldsService; + + @Override + public CustomFields selectOne(CustomFields customFields) { + QueryWrapper qw = new QueryWrapper(); + qw.setEntity( customFields ); + return customFieldsMapper.selectOne( qw ); + } + + @Override + public String getCustomFieldsValue(String handle, String attribute) { + return customFieldsMapper.selectCustomFieldsValue(handle, attribute); + } + + @Override + public List> getEquipType(String site, String equipType) { + return customFieldsMapper.selectEquipType(site,equipType); + } + + @Override + public List getCustomFields(String handle,String attribute) { + return customFieldsMapper.selectCustomFields(handle,attribute); + } + + @Override + public List getCustomFieldsByHandle(String handle) { + return customFieldsMapper.selectCustomFieldsByHandle(handle); + } + + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) + public void setCustomWithNewTransaction(String handle, String attribute, String value) { + setCustom(handle, attribute, value); + } + + public void setCustom(String handle, String attribute, String value) { + Date nowDate = new Date(); + QueryWrapper customFieldsWrapper = new QueryWrapper<>(); + customFieldsWrapper.eq("HANDLE",handle); + customFieldsWrapper.eq("ATTRIBUTE",attribute); + List list= customFieldsMapper.selectList(customFieldsWrapper); + + //实体赋值 + CustomFields customFields = new CustomFields(); + customFields.setHandle(handle); + customFields.setAttribute(attribute); + customFields.setValue(value); + + if(list.isEmpty()){ + customFields.setCreatedDateTime(nowDate); + customFields.setModifiedDateTime(nowDate); + customFieldsMapper.insert(customFields);//insertAllColumn + }else{ + customFields.setModifiedDateTime(nowDate); + customFieldsMapper.update(customFields,customFieldsWrapper); + } + logger.info("custom fields created: {}, {}", handle, list.isEmpty()); + } + + @Override + public Map getItemGroupPrintTemplate(String sfcBo) { + return customFieldsMapper.selectItemGroupPrintTemplate(sfcBo); + } + + @Override + public Map getItemGroupPrintTemplateByItemBo(String itemBo) { + return customFieldsMapper.selectItemGroupPrintTemplateByItemBo(itemBo); + } + + @Override + public String selectWidthValue(String site, String itemBo) { + return customFieldsMapper.selectWidthValue(site, itemBo); + } + + @Override + public String selectAttributeByItemBo(String itemBo) { + return customFieldsMapper.selectAttributeByItemBo(itemBo); + } + + + + @Override + public IPage selectPage(FrontPage frontPage, CustomFields customFields) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(customFields); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(CustomFields customFields) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(customFields); + return super.list(queryWrapper); + } + + +} \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/CustomFieldsMapper.xml b/meapi/src/main/resources/mapper/CustomFieldsMapper.xml new file mode 100644 index 00000000..74668e47 --- /dev/null +++ b/meapi/src/main/resources/mapper/CustomFieldsMapper.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + HANDLE, ATTRIBUTE, VALUE, CREATED_DATE_TIME, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO CUSTOM_FIELDS + + HANDLE, + ATTRIBUTE, + VALUE, + CREATED_DATE_TIME, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{attribute}, + #{value}, + #{createdDateTime}, + #{modifiedDateTime}, + + + + + INSERT INTO CUSTOM_FIELDS + + + VALUES + + #{handle}, + #{attribute}, + #{value}, + #{createdDateTime}, + #{modifiedDateTime}, + + + + + + + + + + UPDATE CUSTOM_FIELDS + HANDLE=#{et.handle}, + ATTRIBUTE=#{et.attribute}, + VALUE=#{et.value}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND ATTRIBUTE=#{ew.entity.attribute} + AND VALUE=#{ew.entity.value} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + + DELETE FROM CUSTOM_FIELDS + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM CUSTOM_FIELDS + + + + + HANDLE=#{ew.entity.handle} + + AND ATTRIBUTE=#{ew.entity.attribute} + AND VALUE=#{ew.entity.value} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + +