diff --git a/ym-admin/src/main/java/com/cnbm/admin/base/BaseSupport.java b/ym-admin/src/main/java/com/cnbm/admin/base/BaseSupport.java
new file mode 100644
index 0000000..64738e3
--- /dev/null
+++ b/ym-admin/src/main/java/com/cnbm/admin/base/BaseSupport.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2018.
+ * http://www.ulabcare.com
+ */
+
+package com.cnbm.admin.base;
+
+import com.cnbm.admin.entity.LoginUser;
+import com.cnbm.admin.enums.WhetherEnum;
+import lombok.Builder;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.NamedThreadLocal;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 接口支持基类
+ *
+ * @author jiff
+ * @date 2018/11/1
+ * @since 1.0
+ */
+@Service
+public class BaseSupport {
+
+ /**
+ * 获取当前登录用户信息
+ *
+ * @return
+ */
+ protected LoginUser getLoginUser() {
+ UsernamePasswordAuthenticationToken authentication = (UsernamePasswordAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
+
+ if (Objects.isNull(authentication)) {
+ LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ return loginUser;
+ }
+ return null;
+ }
+
+
+ /**
+ * 设置公共字段值,一般用于创建新记录,包含以下字段:
+ *
+ *
+ * {@link CommonField#enabled}
+ * {@link CommonField#valid}
+ * {@link CommonField#creatorId}
+ * {@link CommonField#creatorName}
+ * {@link CommonField#createTime}
+ * {@link CommonField#updaterId}
+ * {@link CommonField#updaterName}
+ * {@link CommonField#updateTime}
+ *
+ *
+ * @param t 需要设置的对象
+ * @param ignoreProperties 忽略的字段
+ * @param
+ */
+ public T setCommonField(T t, String... ignoreProperties) {
+
+ CommonField commonField = CommonField.builder()
+ .enabled(WhetherEnum.YES.getValue())
+ .valid(WhetherEnum.YES.getValue())
+ .createTime(LocalDateTime.now())
+ .creatorId(getLoginUser().getSysUserEntity().getId())
+ .creatorName(getLoginUser().getUsername())
+ .updateTime(LocalDateTime.now())
+ .updaterId(getLoginUser().getSysUserEntity().getId())
+ .updaterName(getLoginUser().getUsername())
+ .build();
+ BeanUtils.copyProperties(commonField, t, ignoreProperties);
+ return t;
+ }
+
+ /**
+ * 设置更新的公共字段值,一般用于更新记录,包含以下字段:
+ *
+ *
+ * {@link CommonField#updaterId}
+ * {@link CommonField#updaterName}
+ * {@link CommonField#updateTime}
+ *
+ *
+ * @param t 需要设置的对象
+ * @param
+ */
+ public T setUpdateCommonField(T t) {
+ CommonField commonField = CommonField.builder()
+ .updaterId(getLoginUser().getSysUserEntity().getId())
+ .updaterName(getLoginUser().getUsername())
+ .updateTime(LocalDateTime.now())
+ .build();
+ BeanUtils.copyProperties(commonField, t, "enabled", "valid");
+ return t;
+ }
+
+ @Data
+ @Builder
+ private static class CommonField implements Serializable {
+ /**
+ * 启用状态:0 、停用,1、启用
+ */
+ private Integer enabled;
+ /**
+ * 删除标志,是否有效:1 可用 0不可用
+ */
+ private Integer valid;
+
+ /**
+ * 创建人
+ */
+ private Long creatorId;
+ /**
+ * 创建人
+ */
+ private String creatorName;
+ /**
+ * 创建时间
+ */
+ private LocalDateTime createTime;
+
+
+ /**
+ * 更新人
+ */
+ private Long updaterId;
+ /**
+ * 更新人
+ */
+ private String updaterName;
+ /**
+ * 更新时间
+ */
+ private LocalDateTime updateTime;
+ }
+}
diff --git a/ym-gateway/src/main/resources/application-dev.yml b/ym-gateway/src/main/resources/application-dev.yml
index d85aabd..3bbe591 100644
--- a/ym-gateway/src/main/resources/application-dev.yml
+++ b/ym-gateway/src/main/resources/application-dev.yml
@@ -61,14 +61,14 @@ dynamic:
# username: root
# password: 1qaz@WSX3edc$RFV
## camline系统
-# camline:
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-# username: root
-# password: 1qaz@WSX3edc$RFV
-#
camline:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
- username: offline_data
- password: tpvmfab4
\ No newline at end of file
+ url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+ username: root
+ password: 1qaz@WSX3edc$RFV
+#
+# camline:
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+# username: offline_data
+# password: tpvmfab4
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
index fd5aebb..add9f87 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
@@ -210,9 +210,9 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("insertSubstrateManual")
@ApiOperation("手动装箱")
@LogOperation("手动装箱")
- public Result insertSubstrateManual(@RequestBody ChangePackingBoxDTO dto){
+ public Result insertSubstrateManual(@RequestBody ChangePackingBoxDTO[] dtos){
- woPackagingBoxSubstrateService.insertSubstrateManual(dto);
+ woPackagingBoxSubstrateService.insertSubstrateManual(dtos);
return new Result();
}
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
index ad4a4ed..8668a9f 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
@@ -32,7 +32,7 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService implements ChangePackagingBoxHistoryServiceBiz {
+ @Autowired
+ private BaseSupport baseSupport;
+
@Override
public QueryWrapper getWrapper(Map params){
LocalDateTime startTime = (LocalDateTime) params.get("startTime");
@@ -65,6 +71,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl getWrapper(Map params){
@@ -69,6 +72,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl getWrapper(Map params){
@@ -66,6 +69,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl getWrapper(Map params){
@@ -83,6 +87,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl getWrapper(Map params){
@@ -75,6 +78,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl wrapper = new UpdateWrapper<>();
@@ -126,10 +132,12 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()),WoPackagingBoxSubstrate.WO_SUBSTRATE_ID,dto.getWoSubstrateId());
- if(mapper.selectCount(wrapper)>0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) {
- WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0);
- substrate.setPackagingBoxId(dto.getPackagingBoxId());
- updateById(substrate);
- }
- else{
- //模组ID有时为空,用户会输入”无码“
- if(dto.getWoSubstrateId()==null) {
- dto.setWoSubstrateId("无码");
+ public void insertSubstrateManual(ChangePackingBoxDTO[] dtos) {
+ for(ChangePackingBoxDTO dto : dtos) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()), WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId());
+ if (mapper.selectCount(wrapper) > 0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) {
+ WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0);
+ substrate.setPackagingBoxId(dto.getPackagingBoxId());
+ baseSupport.setUpdateCommonField(substrate);
+ updateById(substrate);
+ } else {
+ //模组ID有时为空,用户会输入”无码“
+ if (dto.getWoSubstrateId() == null) {
+ dto.setWoSubstrateId("无码");
+ }
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
+ baseSupport.setCommonField(entity);
+ insert(entity);
}
- //效验数据
- ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
- WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
- insert(entity);
}
}
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java
index 704a680..55f8909 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java
@@ -3,6 +3,7 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.enums.WhetherEnum;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -42,6 +43,8 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl getWrapper(Map params){
@@ -64,6 +67,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl