Browse Source

标签自定义功能化

master
DOUDOU 3 years ago
parent
commit
87b81d87c2
  1. 77
      src/main/java/com/gaotao/modules/base/controller/LabelSettingController.java
  2. 31
      src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
  3. 65
      src/main/java/com/gaotao/modules/base/entity/LabelSettingData.java
  4. 23
      src/main/java/com/gaotao/modules/base/service/BaseService.java
  5. 34
      src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
  6. 40
      src/main/resources/mapper/base/BaseMapper.xml

77
src/main/java/com/gaotao/modules/base/controller/LabelSettingController.java

@ -0,0 +1,77 @@
package com.gaotao.modules.base.controller;
import com.alibaba.fastjson.JSONObject;
import com.gaotao.common.utils.R;
import com.gaotao.modules.base.entity.LabelSettingData;
import com.gaotao.modules.base.service.BaseService;
import com.gaotao.modules.print.entity.DumpPrint;
import com.gaotao.modules.print.service.PrintService;
import com.gaotao.modules.print.service.SysUserPrinterService;
import com.gaotao.modules.schedule.data.ScheduleData;
import com.gaotao.modules.schedule.data.SearchScheduleData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpSession;
import java.util.List;
@RestController
@RequestMapping("/label/setting")
public class LabelSettingController {
@Autowired
private BaseService baseService;
/**
* @description: 查询打印标签的定义参数
* @author LR
* @date 2022/12/27 17:49
* @version 1.0
*/
@RequestMapping(value = "getLabelSettingList")
public R getLabelSettingList(@RequestBody LabelSettingData inData){
List<LabelSettingData> resultList = baseService.getLabelSettingList(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("rows", resultList)
.put("total", resultList.size());
}
/**
* @description: 插入标签自定义的数据
* @author LR
* @date 2022/12/28 15:29
* @version 1.0
*/
@RequestMapping(value = "insertLabelSetting")
public R insertLabelSetting(@RequestBody LabelSettingData inData){
baseService.insertLabelSetting(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
}
/**
* @description: 修改标签自定义的数据
* @author LR
* @date 2022/12/28 15:30
* @version 1.0
*/
@RequestMapping(value = "updateLabelSetting")
public R updateLabelSetting(@RequestBody LabelSettingData inData){
baseService.updateLabelSetting(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!");
}
}

31
src/main/java/com/gaotao/modules/base/dao/BaseMapper.java

@ -1639,4 +1639,35 @@ public interface BaseMapper {
*/
PartFamilyData getPartFamilyInfo(@Param("site") String site,@Param("familyID") String familyID);
/**
* @description: 获取标签定义的列表信息
* @author LR
* @date 2022/12/27 17:55
* @version 1.0
*/
List<LabelSettingData> getLabelSettingList(LabelSettingData inData);
/**
* @description: 获取标签信息按照标签编号查询
* @author LR
* @date 2022/12/28 15:48
* @version 1.0
*/
LabelSettingData getLabelSettingByLabelNo(String labelNo);
/**
* @description: 插入标签的信息
* @author LR
* @date 2022/12/28 16:02
* @version 1.0
*/
void insertLabelSetting(LabelSettingData inData);
/**
* @description: 修改标签自定义的信息
* @author LR
* @date 2022/12/28 16:03
* @version 1.0
*/
void updateLabelSetting(LabelSettingData inData);
}

65
src/main/java/com/gaotao/modules/base/entity/LabelSettingData.java

@ -0,0 +1,65 @@
package com.gaotao.modules.base.entity;
import org.apache.ibatis.type.Alias;
@Alias("LabelSettingData")
public class LabelSettingData {
private String labelNo;//
private String labelType;//
private String labelName;//
private String labelClass;//
private String remark;//
private String searchFlag;//是否查询
public LabelSettingData() {
}
public String getLabelNo() {
return labelNo;
}
public void setLabelNo(String labelNo) {
this.labelNo = labelNo;
}
public String getLabelType() {
return labelType;
}
public void setLabelType(String labelType) {
this.labelType = labelType;
}
public String getLabelName() {
return labelName;
}
public void setLabelName(String labelName) {
this.labelName = labelName;
}
public String getLabelClass() {
return labelClass;
}
public void setLabelClass(String labelClass) {
this.labelClass = labelClass;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getSearchFlag() {
return searchFlag;
}
public void setSearchFlag(String searchFlag) {
this.searchFlag = searchFlag;
}
}

23
src/main/java/com/gaotao/modules/base/service/BaseService.java

@ -891,4 +891,27 @@ public interface BaseService {
*/
PartFamilyData getPartFamilyInfo(String site, String familyID);
/**
* @description: 查询打印标签的定义参数
* @author LR
* @date 2022/12/27 17:55
* @version 1.0
*/
List<LabelSettingData> getLabelSettingList(LabelSettingData inData);
/**
* @description: 插入标签自定义的数据
* @author LR
* @date 2022/12/28 15:30
* @version 1.0
*/
void insertLabelSetting(LabelSettingData inData);
/**
* @description: 修改标签自定义的数据
* @author LR
* @date 2022/12/28 15:31
* @version 1.0
*/
void updateLabelSetting(LabelSettingData inData);
}

34
src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java

@ -3,6 +3,7 @@ package com.gaotao.modules.base.service.Impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gaotao.common.exception.XJException;
import com.gaotao.common.utils.DateUtil;
import com.gaotao.common.utils.PageUtils;
import com.gaotao.modules.base.dao.BaseMapper;
@ -1846,4 +1847,37 @@ public class BaseServiceImpl implements BaseService {
public PartFamilyData getPartFamilyInfo(String site, String familyID) {
return baseMapper.getPartFamilyInfo(site,familyID);
}
@Override
public List<LabelSettingData> getLabelSettingList(LabelSettingData inData) {
String searchFlag = inData.getSearchFlag();
if("N".equalsIgnoreCase(searchFlag)){
return new ArrayList<LabelSettingData>();
}else{
//判断是否查询
return baseMapper.getLabelSettingList(inData);
}
}
@Override
@Transactional
public void insertLabelSetting(LabelSettingData inData) {
//公共参数
String labelNo = inData.getLabelNo();
//1.查询是否重复
LabelSettingData labelSetting = baseMapper.getLabelSettingByLabelNo(labelNo);
//判断空值
if(null == labelSetting){
//2.判断没有问题 插入数据
baseMapper.insertLabelSetting(inData);
}else{
throw new XJException("标签编号重复!");
}
}
@Override
public void updateLabelSetting(LabelSettingData inData) {
//修改标签的信息
baseMapper.updateLabelSetting(inData);
}
}

40
src/main/resources/mapper/base/BaseMapper.xml

@ -1752,4 +1752,44 @@
AND scheduledate = #{scheduledate}
</update>
<!--查询标签定义的相关信息-->
<select id="getLabelSettingList" parameterType="LabelSettingData" resultType="LabelSettingData">
SELECT ReportID labelNo, ReportFamily labelType, Reportfile labelName, ReportType labelClass, Remark remark
FROM ReportFileList
<where>
<if test="labelNo != null and labelNo != ''">
and ReportID LIKE #{labelNo}
</if>
<if test="labelType != null and labelType != ''">
and ReportFamily LIKE #{labelType}
</if>
<if test="labelName != null and labelName != ''">
and Reportfile LIKE #{labelName}
</if>
</where>
ORDER BY ReportID ASC
</select>
<!--查询标签定义的相关信息按照标签的编码-->
<select id="getLabelSettingByLabelNo" parameterType="java.lang.String" resultType="LabelSettingData">
SELECT ReportID labelNo, ReportFamily labelType, Reportfile labelName, ReportType labelClass, Remark remark
FROM ReportFileList
<where>
AND ReportID = #{labelNo}
</where>
</select>
<!--插入标签自定义的数据-->
<insert id="insertLabelSetting" parameterType="LabelSettingData">
INSERT INTO ReportFileList(ReportID, ReportFamily, Reportfile, ReportType, Remark)
VALUES(#{labelNo}, #{labelType}, #{labelName}, #{labelClass}, #{remark})
</insert>
<!--修改标签自定义的信息-->
<update id="updateLabelSetting" parameterType="LabelSettingData">
UPDATE ReportFileList SET ReportFamily = #{labelType}, Reportfile = #{labelName}, ReportType = #{labelClass}, Remark = #{remark}
<where>
AND ReportID = #{labelNo}
</where>
</update>
</mapper>
Loading…
Cancel
Save