From 316ef1bf39d16a29c27fe26393e704c1d0b963f9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 21 十月 2024 13:59:47 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml | 6
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml | 12 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPassRateMapper.xml | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcComponentInfoController.java | 50 ++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml | 8
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java | 7 +
/dev/null | 18 ---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcComponentInfoMapper.xml | 18 +++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcComponentInfoMapper.java | 25 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcComponentInfo.java | 90 +++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcComponentInfoServiceImpl.java | 26 ++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java | 3
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcComponentInfoService.java | 19 +++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml | 8
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java | 10 +
lxzn-module-system/lxzn-system-start/src/main/resources/jeecg/jeecg_database.properties | 4
20 files changed, 249 insertions(+), 73 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/ComponentInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcComponentInfoController.java
similarity index 69%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/ComponentInfoController.java
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcComponentInfoController.java
index 623219f..6cd683a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/ComponentInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcComponentInfoController.java
@@ -10,8 +10,8 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.mdc.entity.ComponentInfo;
-import org.jeecg.modules.mdc.service.IComponentInfoService;
+import org.jeecg.modules.mdc.entity.MdcComponentInfo;
+import org.jeecg.modules.mdc.service.IMdcComponentInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -24,21 +24,21 @@
/**
* @Description: 闆朵欢琛�
* @Author: lius
- * @Date: 2024-10-18
+ * @Date: 2024-10-21
* @Version: V1.0
*/
@Slf4j
@Api(tags = "闆朵欢琛�")
@RestController
-@RequestMapping("/mdc/componentInfo")
-public class ComponentInfoController extends JeecgController<ComponentInfo, IComponentInfoService> {
+@RequestMapping("/mdc/mdcComponentInfo")
+public class MdcComponentInfoController extends JeecgController<MdcComponentInfo, IMdcComponentInfoService> {
@Resource
- private IComponentInfoService componentInfoService;
+ private IMdcComponentInfoService mdcComponentInfoService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param componentInfo
+ * @param mdcComponentInfo
* @param pageNo
* @param pageSize
* @param req
@@ -47,41 +47,41 @@
@AutoLog(value = "闆朵欢琛�-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "闆朵欢琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "闆朵欢琛�-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(ComponentInfo componentInfo,
+ public Result<?> queryPageList(MdcComponentInfo mdcComponentInfo,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<ComponentInfo> queryWrapper = QueryGenerator.initQueryWrapper(componentInfo, req.getParameterMap());
- Page<ComponentInfo> page = new Page<ComponentInfo>(pageNo, pageSize);
- IPage<ComponentInfo> pageList = componentInfoService.page(page, queryWrapper);
+ QueryWrapper<MdcComponentInfo> queryWrapper = QueryGenerator.initQueryWrapper(mdcComponentInfo, req.getParameterMap());
+ Page<MdcComponentInfo> page = new Page<MdcComponentInfo>(pageNo, pageSize);
+ IPage<MdcComponentInfo> pageList = mdcComponentInfoService.page(page);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param componentInfo
+ * @param mdcComponentInfo
* @return
*/
@AutoLog(value = "闆朵欢琛�-娣诲姞")
@ApiOperation(value = "闆朵欢琛�-娣诲姞", notes = "闆朵欢琛�-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody ComponentInfo componentInfo) {
- componentInfoService.save(componentInfo);
+ public Result<?> add(@RequestBody MdcComponentInfo mdcComponentInfo) {
+ mdcComponentInfoService.save(mdcComponentInfo);
return Result.OK("娣诲姞鎴愬姛锛�");
}
/**
* 缂栬緫
*
- * @param componentInfo
+ * @param mdcComponentInfo
* @return
*/
@AutoLog(value = "闆朵欢琛�-缂栬緫")
@ApiOperation(value = "闆朵欢琛�-缂栬緫", notes = "闆朵欢琛�-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<?> edit(@RequestBody ComponentInfo componentInfo) {
- componentInfoService.updateById(componentInfo);
+ public Result<?> edit(@RequestBody MdcComponentInfo mdcComponentInfo) {
+ mdcComponentInfoService.updateById(mdcComponentInfo);
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -95,7 +95,7 @@
@ApiOperation(value = "闆朵欢琛�-閫氳繃id鍒犻櫎", notes = "闆朵欢琛�-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
- componentInfoService.removeById(id);
+ mdcComponentInfoService.removeById(id);
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -109,7 +109,7 @@
@ApiOperation(value = "闆朵欢琛�-鎵归噺鍒犻櫎", notes = "闆朵欢琛�-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.componentInfoService.removeByIds(Arrays.asList(ids.split(",")));
+ this.mdcComponentInfoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
@@ -123,19 +123,19 @@
@ApiOperation(value = "闆朵欢琛�-閫氳繃id鏌ヨ", notes = "闆朵欢琛�-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
- ComponentInfo componentInfo = componentInfoService.getById(id);
- return Result.OK(componentInfo);
+ MdcComponentInfo mdcComponentInfo = mdcComponentInfoService.getById(id);
+ return Result.OK(mdcComponentInfo);
}
/**
* 瀵煎嚭excel
*
* @param request
- * @param componentInfo
+ * @param mdcComponentInfo
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, ComponentInfo componentInfo) {
- return super.exportXls(request, componentInfo, ComponentInfo.class, "闆朵欢琛�");
+ public ModelAndView exportXls(HttpServletRequest request, MdcComponentInfo mdcComponentInfo) {
+ return super.exportXls(request, mdcComponentInfo, MdcComponentInfo.class, "闆朵欢琛�");
}
/**
@@ -147,7 +147,7 @@
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, ComponentInfo.class);
+ return super.importExcel(request, response, MdcComponentInfo.class);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ComponentInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ComponentInfo.java
deleted file mode 100644
index f9a864c..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/ComponentInfo.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.jeecg.modules.mdc.entity;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: 闆朵欢琛�
- * @Author: lius
- * @Date: 2024-10-18
- * @Version: V1.0
- */
-@Data
-@TableName("Component_Info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "Component_Info瀵硅薄", description = "闆朵欢琛�")
-public class ComponentInfo implements Serializable {
-
- private static final long serialVersionUID = -9191357592954290074L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private String id;
- /**
- * componentNo
- */
- @Excel(name = "componentNo", width = 15)
- @ApiModelProperty(value = "componentNo")
- private String componentNo;
- /**
- * componentName
- */
- @Excel(name = "componentName", width = 15)
- @ApiModelProperty(value = "componentName")
- private String componentName;
- /**
- * scheduleNum
- */
- @Excel(name = "scheduleNum", width = 15)
- @ApiModelProperty(value = "scheduleNum")
- private Integer scheduleNum;
- /**
- * dayNum
- */
- @Excel(name = "dayNum", width = 15)
- @ApiModelProperty(value = "dayNum")
- private Integer dayNum;
- /**
- * beltlineid
- */
- @Excel(name = "beltlineid", width = 15)
- @ApiModelProperty(value = "beltlineid")
- private String beltlineid;
- /**
- * overallflag
- */
- @Excel(name = "overallflag", width = 15)
- @ApiModelProperty(value = "overallflag")
- private Boolean overallflag;
- /**
- * equipmentids
- */
- @Excel(name = "equipmentids", width = 15)
- @ApiModelProperty(value = "equipmentids")
- private String equipmentids;
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcComponentInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcComponentInfo.java
new file mode 100644
index 0000000..0666eff
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcComponentInfo.java
@@ -0,0 +1,90 @@
+package org.jeecg.modules.mdc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 闆朵欢琛�
+ * @Author: lius
+ * @Date: 2024-10-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("mdc_component_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_component_info瀵硅薄", description = "闆朵欢琛�")
+public class MdcComponentInfo extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = 3989002838907751149L;
+
+ /**
+ * 闆朵欢鍙�
+ */
+ @Excel(name = "闆朵欢鍙�", width = 15)
+ @ApiModelProperty(value = "闆朵欢鍙�")
+ private String componentNo;
+ /**
+ * 闆朵欢鍚嶇О
+ */
+ @Excel(name = "闆朵欢鍚嶇О", width = 15)
+ @ApiModelProperty(value = "闆朵欢鍚嶇О")
+ private String componentName;
+ /**
+ * 鐝骇鑳�
+ */
+ @Excel(name = "鐝骇鑳�", width = 15)
+ @ApiModelProperty(value = "鐝骇鑳�")
+ private Integer scheduleNum;
+ /**
+ * 澶╀骇鑳�
+ */
+ @Excel(name = "澶╀骇鑳�", width = 15)
+ @ApiModelProperty(value = "澶╀骇鑳�")
+ private Integer dayNum;
+ /**
+ * 浜х嚎
+ */
+ //@Excel(name = "浜х嚎", width = 15)
+ //@ApiModelProperty(value = "浜х嚎")
+ private String beltlineId;
+// /**
+// * 杞﹂棿鍚嶇О
+// */
+// @TableField(exist = false)
+// @Excel(name = "浜х嚎", width = 15)
+// @ApiModelProperty(value = "浜х嚎")
+// private String productionName;
+ /**
+ * 鏄惁涓鸿嚜鍔ㄧ嚎
+ */
+ @Excel(name = "鏄惁涓鸿嚜鍔ㄧ嚎", width = 15)
+ @ApiModelProperty(value = "鏄惁涓鸿嚜鍔ㄧ嚎")
+ private String overallFlag;
+ /**
+ * 璁惧
+ */
+ @Excel(name = "璁惧", width = 15)
+ @ApiModelProperty(value = "璁惧")
+ private String equipmentId;
+ /**
+ * 杞﹂棿ID
+ */
+ @Excel(name = "浜х嚎", width = 15)
+ @ApiModelProperty(value = "浜х嚎")
+ @Dict(dictTable ="mdc_production",dicText = "production_name",dicCode = "id")
+ private String productionId;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ComponentInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ComponentInfoMapper.java
deleted file mode 100644
index 073b154..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/ComponentInfoMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.mdc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.mdc.entity.ComponentInfo;
-
-/**
- * @Description: 闆朵欢琛�
- * @Author: lius
- * @Date: 2024-10-18
- * @Version: V1.0
- */
-public interface ComponentInfoMapper extends BaseMapper<ComponentInfo> {
-
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcComponentInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcComponentInfoMapper.java
new file mode 100644
index 0000000..a7c1893
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcComponentInfoMapper.java
@@ -0,0 +1,25 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.entity.MdcComponentInfo;
+
+/**
+ * @Description: 闆朵欢琛�
+ * @Author: lius
+ * @Date: 2024-10-21
+ * @Version: V1.0
+ */
+public interface MdcComponentInfoMapper extends BaseMapper<MdcComponentInfo> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param page
+ * @param mdcComponentInfo
+ * @return
+ */
+ IPage<MdcComponentInfo> pageList(Page<MdcComponentInfo> page, @Param("mdcComponentInfo") MdcComponentInfo mdcComponentInfo);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ComponentInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ComponentInfoMapper.xml
deleted file mode 100644
index 01afb95..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/ComponentInfoMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="org.jeecg.modules.mdc.mapper.ComponentInfoMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
index 8dd26db..4204d28 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentAlarmMapper.xml
@@ -46,10 +46,10 @@
EquipmentAlarm t1 LEFT JOIN mdc_equipment t2 ON t1.EquipmentID = t2.equipment_id
<where>
<if test="equipmentAlarmVo.equipmentId != null and equipmentAlarmVo.equipmentId != ''">
- AND t1.EquipmentID LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentId}),'%')
+ AND t1.EquipmentID LIKE '%' + #{equipmentAlarmVo.equipmentId} + '%'
</if>
<if test="equipmentAlarmVo.equipmentName != null and equipmentAlarmVo.equipmentName != ''">
- AND t2.equipment_name LIKE CONCAT(CONCAT('%',#{equipmentAlarmVo.equipmentName}),'%')
+ AND t2.equipment_name LIKE '%' + #{equipmentAlarmVo.equipmentName} + '%'
</if>
<if test="equipmentAlarmVo.startTime != null and equipmentAlarmVo.endTime != null">
AND t1.collectTime BETWEEN #{equipmentAlarmVo.startTime} AND #{equipmentAlarmVo.endTime}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
index e86cee4..405a6bd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentElectricStatisticalMapper.xml
@@ -9,10 +9,10 @@
equipment_electric_statistical
<where>
<if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
- AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+ AND equipmentID LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
</if>
<if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
- AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+ AND equipmentName LIKE '%' +#{equipmentElectricStatisticalVo.equipmentName} + '%'
</if>
<if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
AND axisType = #{equipmentElectricStatisticalVo.axistype}
@@ -37,10 +37,10 @@
equipment_electric_statistical
<where>
<if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
- AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+ AND equipmentID LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
</if>
<if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
- AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+ AND equipmentName LIKE '%' + #{equipmentElectricStatisticalVo.equipmentName} + '%'
</if>
<if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
AND axisType = #{equipmentElectricStatisticalVo.axistype}
@@ -65,10 +65,10 @@
equipment_electric_statistical
<where>
<if test="equipmentElectricStatisticalVo.equipmentId != null and equipmentElectricStatisticalVo.equipmentId != ''">
- AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentId}),'%')
+ AND equipmentID LIKE '%' + #{equipmentElectricStatisticalVo.equipmentId} + '%'
</if>
<if test="equipmentElectricStatisticalVo.equipmentName != null and equipmentElectricStatisticalVo.equipmentName != ''">
- AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentElectricStatisticalVo.equipmentName}),'%')
+ AND equipmentName LIKE '%' + #{equipmentElectricStatisticalVo.equipmentName} + '%'
</if>
<if test="equipmentElectricStatisticalVo.axistype != null and equipmentElectricStatisticalVo.axistype != ''">
AND axisType = #{equipmentElectricStatisticalVo.axistype}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml
index a4723e2..dab94c5 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/EquipmentSpindleStatisticalMapper.xml
@@ -9,10 +9,10 @@
equipment_spindle_statistical
<where>
<if test="equipmentSpindleStatisticalVo.equipmentId != null and equipmentSpindleStatisticalVo.equipmentId != ''">
- AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentId}),'%')
+ AND equipmentID LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentId} + '%'
</if>
<if test="equipmentSpindleStatisticalVo.equipmentName != null and equipmentSpindleStatisticalVo.equipmentName != ''">
- AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentName}),'%')
+ AND equipmentName LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentName} + '%'
</if>
<if test="equipmentSpindleStatisticalVo.createDate != null and equipmentSpindleStatisticalVo.createDate != ''">
AND createDate = #{equipmentSpindleStatisticalVo.createDate}
@@ -34,10 +34,10 @@
equipment_spindle_statistical
<where>
<if test="equipmentSpindleStatisticalVo.equipmentId != null and equipmentSpindleStatisticalVo.equipmentId != ''">
- AND equipmentID LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentId}),'%')
+ AND equipmentID LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentId} + '%'
</if>
<if test="equipmentSpindleStatisticalVo.equipmentName != null and equipmentSpindleStatisticalVo.equipmentName != ''">
- AND equipmentName LIKE CONCAT(CONCAT('%',#{equipmentSpindleStatisticalVo.equipmentName}),'%')
+ AND equipmentName LIKE '%' + #{equipmentSpindleStatisticalVo.equipmentName} + '%'
</if>
<if test="equipmentSpindleStatisticalVo.createDate != null and equipmentSpindleStatisticalVo.createDate != ''">
AND createDate = #{equipmentSpindleStatisticalVo.createDate}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcComponentInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcComponentInfoMapper.xml
new file mode 100644
index 0000000..5a7f989
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcComponentInfoMapper.xml
@@ -0,0 +1,18 @@
+<?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="org.jeecg.modules.mdc.mapper.MdcComponentInfoMapper">
+
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcComponentInfo">
+ SELECT
+ t1.*,
+ t2.production_name productionName
+ FROM
+ mdc_component_info t1
+ LEFT JOIN mdc_production t2 ON t1.production_id = t2.id
+ <where>
+ <if test="mdcComponentInfo.componentName != null and mdcComponentInfo.componentName != ''">
+ AND t1.component_name LIKE '%' + #{mdcComponentInfo.componentName} + '%'
+ </if>
+ </where>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPassRateMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPassRateMapper.xml
index b3f063a..2f6305b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPassRateMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcPassRateMapper.xml
@@ -7,10 +7,10 @@
SELECT * FROM mdc_pass_rate
<where>
<if test="mdcPassRate.equipmentName != null and mdcPassRate.equipmentName != '' ">
- AND equipment_name LIKE CONCAT(CONCAT('%',#{mdcPassRate.equipmentName}),'%')
+ AND equipment_name LIKE '%' + #{mdcPassRate.equipmentName} + '%')
</if>
<if test="mdcPassRate.equipmentId != null and mdcPassRate.equipmentId != '' ">
- AND equipment_id LIKE CONCAT(CONCAT('%',#{mdcPassRate.equipmentId}),'%')
+ AND equipment_id LIKE '%' + #{mdcPassRate.equipmentId} + '%'
</if>
<if test="mdcPassRate.startTime != null and mdcPassRate.endTime != null">
AND efficient_date BETWEEN #{ mdcPassRate.startTime } AND #{ mdcPassRate.endTime }
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
index 182be09..f4e4219 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessCountMapper.xml
@@ -23,7 +23,7 @@
AND t1.equipment_id = #{ mdcProcessCountVo.equipmentId }
</if>
<if test="mdcProcessCountVo.equipmentName != null and mdcProcessCountVo.equipmentName != ''">
- AND t1.equipment_name LIKE CONCAT(CONCAT('%',#{mdcProcessCountVo.equipmentName}),'%')
+ AND t1.equipment_name LIKE '%' + #{mdcProcessCountVo.equipmentName} + '%'
</if>
<if test="mdcProcessCountVo.driveType != null and mdcProcessCountVo.driveType != ''">
AND t2.drive_type = #{ mdcProcessCountVo.driveType }
@@ -55,7 +55,7 @@
FROM
mdc_process_count
WHERE
- equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%')
+ equipment_id = #{ equipmentId } AND the_date LIKE #{ validDate } + '%'
</select>
@@ -65,6 +65,6 @@
FROM
mdc_process_count
WHERE
- equipment_id = #{ equipmentId } AND the_date LIKE CONCAT(#{ validDate }, '%')
+ equipment_id = #{ equipmentId } AND the_date LIKE #{ validDate } + '%'
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IComponentInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IComponentInfoService.java
deleted file mode 100644
index 1f80149..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IComponentInfoService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.mdc.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.mdc.entity.ComponentInfo;
-
-/**
- * @Description: 闆朵欢琛�
- * @Author: lius
- * @Date: 2024-10-18
- * @Version: V1.0
- */
-public interface IComponentInfoService extends IService<ComponentInfo> {
-
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcComponentInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcComponentInfoService.java
new file mode 100644
index 0000000..9353a44
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcComponentInfoService.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcComponentInfo;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 闆朵欢琛�
+ * @Author: lius
+ * @Date: 2024-10-21
+ * @Version: V1.0
+ */
+public interface IMdcComponentInfoService extends IService<MdcComponentInfo> {
+
+ IPage<MdcComponentInfo> pageList(Page<MdcComponentInfo> page, MdcComponentInfo mdcComponentInfo, HttpServletRequest req);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ComponentInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ComponentInfoServiceImpl.java
deleted file mode 100644
index 3d7f927..0000000
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ComponentInfoServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jeecg.modules.mdc.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.mdc.entity.ComponentInfo;
-import org.jeecg.modules.mdc.mapper.ComponentInfoMapper;
-import org.jeecg.modules.mdc.service.IComponentInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 闆朵欢琛�
- * @Author: lius
- * @Date: 2024-10-18
- * @Version: V1.0
- */
-@Service
-public class ComponentInfoServiceImpl extends ServiceImpl<ComponentInfoMapper, ComponentInfo> implements IComponentInfoService {
-
-}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcComponentInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcComponentInfoServiceImpl.java
new file mode 100644
index 0000000..528ec66
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcComponentInfoServiceImpl.java
@@ -0,0 +1,26 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcComponentInfo;
+import org.jeecg.modules.mdc.mapper.MdcComponentInfoMapper;
+import org.jeecg.modules.mdc.service.IMdcComponentInfoService;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 闆朵欢琛�
+ * @Author: lius
+ * @Date: 2024-10-21
+ * @Version: V1.0
+ */
+@Service
+public class MdcComponentInfoServiceImpl extends ServiceImpl<MdcComponentInfoMapper, MdcComponentInfo> implements IMdcComponentInfoService {
+
+ @Override
+ public IPage<MdcComponentInfo> pageList(Page<MdcComponentInfo> page, MdcComponentInfo mdcComponentInfo, HttpServletRequest req) {
+ return this.baseMapper.pageList(page, mdcComponentInfo);
+ }
+}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
index bac0744..0cb7a9b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/mapper/xml/SysQuartzLogMapper.xml
@@ -26,10 +26,10 @@
AND t1.create_time BETWEEN #{ sysQuartzLogVo.startTime } AND #{ sysQuartzLogVo.endTime }
</if>
<if test="sysQuartzLogVo.jobName != null and sysQuartzLogVo.jobName != ''">
- AND t2.job_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobName }),'%')
+ AND t2.job_name LIKE '%' + #{ sysQuartzLogVo.jobName } + '%'
</if>
<if test="sysQuartzLogVo.description != null and sysQuartzLogVo.description != ''">
- AND t2.description LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.description }),'%')
+ AND t2.description LIKE '%' + #{ sysQuartzLogVo.description }) + '%'
</if>
</where>
ORDER BY t1.create_time DESC
@@ -59,10 +59,10 @@
AND t1.create_time BETWEEN #{ sysQuartzLogVo.startTime } AND #{ sysQuartzLogVo.endTime }
</if>
<if test="sysQuartzLogVo.jobName != null and sysQuartzLogVo.jobName != ''">
- AND t2.job_name LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.jobName }),'%')
+ AND t2.job_name LIKE '%' + #{ sysQuartzLogVo.jobName } + '%'
</if>
<if test="sysQuartzLogVo.description != null and sysQuartzLogVo.description != ''">
- AND t2.description LIKE CONCAT(CONCAT('%',#{ sysQuartzLogVo.description }),'%')
+ AND t2.description LIKE '%' + #{ sysQuartzLogVo.description } + '%'
</if>
</where>
ORDER BY t1.create_time DESC
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
index e5cabaa..24d2310 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/MdcProductionController.java
@@ -283,4 +283,11 @@
return super.importExcel(request, response, MdcProduction.class);
}
+ @AutoLog(value = "浜х嚎琛�-")
+ @ApiOperation(value = "浜х嚎琛�-", notes = "浜х嚎琛�-")
+ @GetMapping(value = "/queryById")
+ public Result<?> productionList() {
+ List<MdcProduction> productionList = mdcProductionService.productionList();
+ return Result.OK(productionList);
+ }
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index df2baa5..76b8cdc 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -46,10 +46,10 @@
and sa.del_flag = '0'
and sas.user_id = #{announcementSendModel.userId}
<if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
- and sa.titile LIKE concat(concat('%',#{announcementSendModel.titile}),'%')
+ and sa.titile LIKE '%' + #{announcementSendModel.titile} + '%'
</if>
<if test="announcementSendModel.sender !=null and announcementSendModel.sender != ''">
- and sa.sender LIKE concat(concat('%',#{announcementSendModel.sender}),'%')
+ and sa.sender LIKE '%' + #{announcementSendModel.sender} + '%'
</if>
<if test="announcementSendModel.readFlag !=null and announcementSendModel.readFlag != ''">
and sas.read_flag = #{announcementSendModel.readFlag}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
index 40e5d7e..3c1a404 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
@@ -23,14 +23,14 @@
<!-- 鏍规嵁閮ㄩ棬Id鏌ヨ,褰撳墠鍜屼笅绾ф墍鏈夐儴闂↖DS -->
<select id="getSubDepIdsByDepId" resultType="java.lang.String">
- select id from sys_depart where del_flag = '0' and org_code like concat((select org_code from sys_depart where id=#{departId}),'%')
+ select id from sys_depart where del_flag = '0' and org_code like (select org_code from sys_depart where id=#{departId}) +'%'
</select>
<!--鏍规嵁閮ㄩ棬缂栫爜鑾峰彇鎴戠殑閮ㄩ棬涓嬫墍鏈夐儴闂╥ds -->
<select id="getSubDepIdsByOrgCodes" resultType="java.lang.String">
select id from sys_depart where del_flag = '0' and
<foreach collection="orgCodes" item="item" index="index" open="(" separator="or" close=")">
- org_code LIKE CONCAT(#{item},'%')
+ org_code LIKE #{item} + '%'
</foreach>
</select>
<!--鏍规嵁parent_id鏌ヨ涓嬬骇閮ㄩ棬-->
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml
index a9e3f05..f8d4973 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartRoleMapper.xml
@@ -6,7 +6,7 @@
<select id="queryDeptRoleByDeptAndUser" resultType="org.jeecg.modules.system.entity.SysDepartRole">
SELECT * FROM sys_depart_role WHERE depart_id IN (
SELECT id FROM sys_depart WHERE id IN (SELECT dep_id FROM sys_user_depart WHERE user_id=#{userId})
- AND org_code LIKE CONCAT(#{orgCode},'%')
+ AND org_code LIKE #{orgCode} + '%'
)
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
index cfd203d..2bee042 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
@@ -83,4 +83,7 @@
* 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺
*/
String findThreeProductionId(String userId);
+
+ List<MdcProduction> productionList();
+
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
index e0511bb..aaac492 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
@@ -129,8 +129,8 @@
// 鑾峰彇鐖剁骇ID
String parentId = mdcProduction.getParentId();
JSONObject formData = new JSONObject();
- formData.put("parentId",parentId);
- String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.PRODUCTION,formData);
+ formData.put("parentId", parentId);
+ String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.PRODUCTION, formData);
mdcProduction.setOrgCode(codeArray[0]);
String orgType = codeArray[1];
mdcProduction.setOrgType(String.valueOf(orgType));
@@ -226,6 +226,7 @@
/**
* 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
+ *
* @param userId
* @param productionId
* @return
@@ -243,6 +244,11 @@
return this.baseMapper.findThreeProductionId(userId);
}
+ @Override
+ public List<MdcProduction> productionList() {
+ return this.baseMapper.selectList(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getOrgType, "3").eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0));
+ }
+
/**
* delete 鏂规硶璋冪敤 閫掑綊鏌ユ壘瀛愰泦id
*/
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/jeecg/jeecg_database.properties b/lxzn-module-system/lxzn-system-start/src/main/resources/jeecg/jeecg_database.properties
index a211592..554dc49 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/jeecg/jeecg_database.properties
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/jeecg/jeecg_database.properties
@@ -21,7 +21,7 @@
#SQLServer2005\u4ee5\u4e0a
diver_name=org.hibernate.dialect.SQLServerDialect
-url=jdbc:sqlserver://localhost:1433;DatabaseName=LXZN_TEST_430
+url=jdbc:sqlserver://192.168.124.116:1433;DatabaseName=LXZN_MDC_YITUO
username=sa
password=123
-database_name=LXZN_TEST_430
\ No newline at end of file
+database_name=LXZN_MDC_YITUO
\ No newline at end of file
--
Gitblit v1.9.3