第三方物资类别修改

src/main/java/com/glxp/api/controller/auth/RegisterController.java

@@ -132,7 +132,7 @@ public class RegisterController {
             JSONObject json = new JSONObject();
             json.put("memPhone", checkCodeRequest.getPhoneNum());
             json.put("code", mobile_code);
-            json.put("createTime", System.currentTimeMillis());
+            json.put("createTime", System.currentTimeMillis() + "");
             //验证码存入redis中
             redisUtil.set(Constant.CAPTCHAS + checkCodeRequest.getPhoneNum(), json, 300L);
             return ResultVOUtils.success("发送成功" + "   " + mobile_code);

src/main/java/com/glxp/api/controller/purchase/SupProductController.java

@@ -144,15 +144,16 @@ public class SupProductController {
         int i = supProductService.findProduct(supProductEntity);
         System.out.println(i);
         if (i == 0) {
-        supProductEntity.setCreateTime(new Date());
-        supProductEntity.setUpdateTime(new Date());
-        supProductEntity.setId(IdUtil.getSnowflakeNextId());
-        boolean b = supProductService.insertRegistration(supProductEntity);
-        if (b) {
-            return ResultVOUtils.success("添加成功");
+            supProductEntity.setCreateTime(new Date());
+            supProductEntity.setUpdateTime(new Date());
+            supProductEntity.setId(IdUtil.getSnowflakeNextId());
+            boolean b = supProductService.insertRegistration(supProductEntity);
+            if (b) {
+                return ResultVOUtils.success("添加成功");
+            } else {
+                return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+            }
         } else {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
-        }} else {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
         }
     }

src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java

@@ -0,0 +1,68 @@
+package com.glxp.api.controller.sync;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.dao.basic.BasicProductsDao;
+import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
+import com.glxp.api.dao.basic.UdiRelevanceDao;
+import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.req.sync.SpsSyncBasicRlRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = "内网基础信息同步修改")
+@RequiredArgsConstructor
+@Slf4j
+public class SpsSyncBasicController {
+
+    private final UdiRelevanceDao udiRelevanceDao;
+    private final BasicProductsDao basicProductsDao;
+    private final CompanyProductRelevanceDao relevanceDao;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spssync/basic/udirl/update")
+    @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE)
+    public BaseResponse udiRlUpdate(@RequestBody UdiRelevanceEntity udiRelevanceEntity) {
+
+        if (udiRelevanceEntity.getId() != null) {
+            return ResultVOUtils.error(500, "缺少唯一标识");
+        }
+        int b = udiRelevanceDao.updateById(udiRelevanceEntity);
+        if (b > 0)
+            return ResultVOUtils.success("更新成功！");
+        else
+            return ResultVOUtils.error(500, "更新失败！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spssync/basic/udirl/batchInsert")
+    @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE)
+    public BaseResponse udiRlUpdate(@RequestBody SpsSyncBasicRlRequest spsSyncBasicRlRequest) {
+
+        if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getUdiRelevanceEntities())) {
+            udiRelevanceDao.replaceBatchs(spsSyncBasicRlRequest.getUdiRelevanceEntities());
+        }
+        if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getBasicProductsEntities())) {
+            basicProductsDao.replaceBatchs(spsSyncBasicRlRequest.getBasicProductsEntities());
+        }
+        if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities())) {
+            relevanceDao.replaceBatchs(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities());
+        }
+        return ResultVOUtils.success("同步成功！");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -1332,5 +1332,6 @@ public class SpsSyncDownloadController {
         }
     }
 
+
 }
 

src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java

@@ -0,0 +1,44 @@
+package com.glxp.api.controller.thrsys;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.thrsys.ThrProductTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class ThrProductTypeCotroller {
+
+    @Resource
+    ThrProductTypeService thrProductTypeService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/thrsys/getThrProductType")
+    public BaseResponse getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest,
+                                        BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrProductTypeEntity> thrProductTypeEntityList
+                = thrProductTypeService.getProductTypes(filterThrProductTypeRequest);
+        PageInfo<ThrProductTypeEntity> pageInfo;
+        pageInfo = new PageInfo<ThrProductTypeEntity>(thrProductTypeEntityList);
+        PageSimpleResponse<ThrProductTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrProductTypeEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+}

src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ThrProductTypeMapper extends BaseMapper<ThrProductTypeEntity> {
+
+    List<ThrProductTypeEntity> getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest);
+
+}

src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java

@@ -0,0 +1,56 @@
+package com.glxp.api.entity.thrsys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@ApiModel(value = "com-glxp-api-entity-thrsys-ThrProductType")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "thr_product_type")
+public class ThrProductTypeEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 类别编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value = "类别编码")
+    private String code;
+
+    /**
+     * 类别名称
+     */
+    @TableField(value = "`name`")
+    @ApiModelProperty(value = "类别名称")
+    private String name;
+
+    /**
+     * 第三系统标识
+     */
+    @TableField(value = "thirdSys")
+    @ApiModelProperty(value = "第三系统标识")
+    private String thirdSys;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/req/sync/SpsSyncBasicRlRequest.java

@@ -0,0 +1,16 @@
+package com.glxp.api.req.sync;
+
+import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
+import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncBasicRlRequest {
+
+    private List<UdiRelevanceEntity> udiRelevanceEntities;
+    private List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
+    private List<BasicProductsEntity> basicProductsEntities;
+}

src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java

@@ -0,0 +1,26 @@
+package com.glxp.api.req.thrsys;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterThrProductTypeRequest extends ListPageRequest {
+
+
+    /**
+     * 类别编码
+     */
+    private String code;
+
+    /**
+     * 类别名称
+     */
+    private String name;
+
+    /**
+     * 第三系统标识
+     */
+    private String thirdSys;
+
+    private String key;
+}

src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java

@@ -0,0 +1,30 @@
+package com.glxp.api.service.thrsys;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.thrsys.ThrProductTypeMapper;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class ThrProductTypeService extends ServiceImpl<ThrProductTypeMapper, ThrProductTypeEntity> {
+    @Resource
+    ThrProductTypeMapper thrProductTypeMapper;
+
+    public List<ThrProductTypeEntity> getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest) {
+        if (filterThrProductTypeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrProductTypeRequest.getPage() != null) {
+            int offset = (filterThrProductTypeRequest.getPage() - 1) * filterThrProductTypeRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrProductTypeRequest.getLimit());
+        }
+        List<ThrProductTypeEntity> data = thrProductTypeMapper.getProductTypes(filterThrProductTypeRequest);
+        return data;
+    }
+}

src/main/resources/mybatis/mapper/thrsys/ThrProductTypeMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.thrsys.ThrProductTypeMapper">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrProductTypeEntity">
+        <!--@mbg.generated-->
+        <!--@Table thr_product_type-->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="code" jdbcType="VARCHAR" property="code"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="thirdSys" jdbcType="VARCHAR" property="thirdSys"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, code, `name`, thirdSys, remark
+    </sql>
+
+
+    <select id="getProductTypes" parameterType="com.glxp.api.req.thrsys.FilterThrProductTypeRequest"
+            resultType="com.glxp.api.entity.thrsys.ThrProductTypeEntity">
+        SELECT *
+        FROM thr_product_type
+        <where>
+            <if test="key != '' and key != null">
+                AND (code LIKE concat('%', #{key}, '%') or name LIKE concat('%', #{key}, '%')
+                    )
+            </if>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+        </where>
+    </select>
+</mapper>