对接修改

ktg-admin/src/main/java/com/ktg/web/controller/common/CommonController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -41,6 +42,8 @@ public class CommonController {
     private ServerConfig serverConfig;
     @Autowired
     private ISysUploadFileService iSysUploadFileService;
+    @Value("${ktg-mes.prod}")
+    private String prodApi;
 
     private static final String FILE_DELIMETER = ",";
 
@@ -82,7 +85,13 @@ public class CommonController {
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            String url;
+            if (StringUtils.isNotBlank(prodApi)) {
+                url = serverConfig.getUrl() + prodApi + fileName;
+            } else {
+                url = serverConfig.getUrl() + fileName;
+            }
+
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", url);
             ajax.put("fileName", fileName);

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/hardware/IsHardwareTypeVO.java

@@ -1,11 +1,15 @@
 package com.ktg.iscs.domain.vo.hardware;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
-import com.ktg.common.core.domain.model.BaseBean;
+import com.ktg.common.core.domain.TreeEntity;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 硬件类型对象 is_hardware_type
  *
@@ -14,7 +18,7 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class IsHardwareTypeVO extends BaseBean
+public class IsHardwareTypeVO extends TreeEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -51,5 +55,25 @@ public class IsHardwareTypeVO extends BaseBean
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
     private String delFlag;
 
+    @Schema(description = "创建人")
+    private String createBy;
+
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @Schema(description = "更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新时间")
+    private Date updateTime;
+
+    /** 备注 */
+    @Schema(description = "备注")
+    private String remark;
+
 
 }

ktg-system/src/main/resources/mapper/system/SysAutoCodePartMapper.xml

@@ -159,6 +159,9 @@
             <if test="partName !=null and partName !=''">
                 part_name = #{partName},
             </if>
+            <if test="partType !=null and partType !=''">
+                part_type = #{partType},
+            </if>
             <if test="partLength !=null and partLength !=0">
                 part_length = #{partLength},
             </if>
@@ -199,4 +202,4 @@
         delete from sys_auto_code_part where part_id = #{partId}
     </delete>
 
-</mapper>
+</mapper>