Merge remote-tracking branch 'origin/master'

highway
wws 11 months ago
commit c0daf9a89a

@ -131,6 +131,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
}
dto.setStationNos(stationNos);
dto.setCode("0");
}else{
dto.setCode("1");
dto.setMessage("MES管理系统接口调用异常:数据缺失");
}
}catch (Exception e){
dto.setCode("1");

@ -1,7 +1,13 @@
package com.op.quality.controller;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.common.core.utils.DateUtils;
import com.op.quality.domain.QcSupplier;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -39,6 +45,22 @@ public class QcCheckTaskProduceController extends BaseController {
@RequiresPermissions("quality:qcProduce:list")
@GetMapping("/list")
public TableDataInfo list(QcCheckTaskProduce qcCheckTaskProduce) {
//默认时间范围T 00:00:00~T+1 00:00:00
if(StringUtils.isEmpty(qcCheckTaskProduce.getProduceDateStart())){
qcCheckTaskProduce.setProduceDateStart(DateUtils.getDate()+" 00:00:00");//start
LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
qcCheckTaskProduce.setProduceDateEnd(dateEndStr);//end
}
if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){
qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start
qcCheckTaskProduce.setCheckTimeEnd(qcCheckTaskProduce.getProduceDateEnd());//end
}
startPage();
List<QcCheckTaskProduce> list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce);
return getDataTable(list);
@ -51,6 +73,22 @@ public class QcCheckTaskProduceController extends BaseController {
@Log(title = "生产过程检验任务", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckTaskProduce qcCheckTaskProduce) {
//默认时间范围T 00:00:00~T+1 00:00:00
if(StringUtils.isEmpty(qcCheckTaskProduce.getProduceDateStart())){
qcCheckTaskProduce.setProduceDateStart(DateUtils.getDate()+" 00:00:00");//start
LocalDate date = LocalDate.now();
LocalDate dateEnd = date.plusDays(1);
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
qcCheckTaskProduce.setProduceDateEnd(dateEndStr);//end
}
if(StringUtils.isEmpty(qcCheckTaskProduce.getCheckTimeStart())){
qcCheckTaskProduce.setCheckTimeStart(qcCheckTaskProduce.getProduceDateStart());//start
qcCheckTaskProduce.setCheckTimeEnd(qcCheckTaskProduce.getProduceDateEnd());//end
}
List<QcCheckTaskProduce> list = qcCheckTaskProduceService.selectQcCheckTaskProduceList(qcCheckTaskProduce);
ExcelUtil<QcCheckTaskProduce> util = new ExcelUtil<QcCheckTaskProduce>(QcCheckTaskProduce.class);
util.exportExcel(response, list, "生产过程检验任务数据");
@ -94,4 +132,14 @@ public class QcCheckTaskProduceController extends BaseController {
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(qcCheckTaskProduceService.deleteQcCheckTaskProduceByRecordIds(recordIds));
}
/**
*
*/
@GetMapping("/getQcListWorkCenter")
public TableDataInfo getQcListWorkCenter(QcCheckTaskProduce qcCheckTaskProduce) {
startPage();
List<QcCheckTaskProduce> list = qcCheckTaskProduceService.getQcListWorkCenter(qcCheckTaskProduce);
return getDataTable(list);
}
}

@ -98,7 +98,7 @@ public class QcMaterialGroupController extends BaseController {
*/
@RequiresPermissions("quality:materialGroup:remove")
@Log(title = "物料组", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable String id) {
QcMaterialGroup parent = new QcMaterialGroup();
parent.setId(id);

@ -92,7 +92,7 @@ public class QcMaterialGroupDetailController extends BaseController {
*/
@RequiresPermissions("quality:materialGroupDetail:remove")
@Log(title = "物料组成员", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable String id) {
QcMaterialGroupDetail groupDetail = qcMaterialGroupDetailService.selectQcMaterialGroupDetailById(id);
boolean hasRule = qcMaterialGroupDetailService.validationData(groupDetail.getMaterialCode());

@ -56,6 +56,8 @@ public class QcCheckProject extends BaseEntity {
/** 删除标识1删除0正常 */
private String delFlag;
private Long serialNumber;
public void setId(String id) {
this.id = id;
}
@ -134,6 +136,14 @@ public class QcCheckProject extends BaseEntity {
return delFlag;
}
public Long getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(Long serialNumber) {
this.serialNumber = serialNumber;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -10,7 +10,7 @@ import com.op.common.core.web.domain.BaseEntity;
/**
* qc_check_task_produce
*
*
* @author Open Platform
* @date 2023-10-19
*/
@ -113,6 +113,43 @@ public class QcCheckTaskProduce extends BaseEntity {
/** 删除标识1删除0正常 */
private String delFlag;
private String produceDateStart;
private String produceDateEnd;
private String checkTimeStart;
private String checkTimeEnd;
public String getProduceDateStart() {
return produceDateStart;
}
public void setProduceDateStart(String produceDateStart) {
this.produceDateStart = produceDateStart;
}
public String getProduceDateEnd() {
return produceDateEnd;
}
public void setProduceDateEnd(String produceDateEnd) {
this.produceDateEnd = produceDateEnd;
}
public String getCheckTimeStart() {
return checkTimeStart;
}
public void setCheckTimeStart(String checkTimeStart) {
this.checkTimeStart = checkTimeStart;
}
public String getCheckTimeEnd() {
return checkTimeEnd;
}
public void setCheckTimeEnd(String checkTimeEnd) {
this.checkTimeEnd = checkTimeEnd;
}
public void setRecordId(String recordId) {
this.recordId = recordId;
}

@ -72,6 +72,8 @@ public class QcCheckTypeProject extends BaseEntity {
private Integer sort;
private String projectNo;
public Integer getSort() {
return sort;
}
@ -191,11 +193,18 @@ public class QcCheckTypeProject extends BaseEntity {
public String getPropertyCode() {
return propertyCode;
}
public void setPropertyCode(String propertyCode) {
this.propertyCode = propertyCode;
}
public String getProjectNo() {
return projectNo;
}
public void setProjectNo(String projectNo) {
this.projectNo = projectNo;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -60,4 +60,6 @@ public interface QcCheckProjectMapper {
* @return
*/
public int deleteQcCheckProjectByIds(String[] ids);
public QcCheckProject selectSerialNumber();
}

@ -5,14 +5,14 @@ import com.op.quality.domain.QcCheckTaskProduce;
/**
* Service
*
*
* @author Open Platform
* @date 2023-10-19
*/
public interface IQcCheckTaskProduceService {
/**
*
*
*
* @param recordId
* @return
*/
@ -20,7 +20,7 @@ public interface IQcCheckTaskProduceService {
/**
*
*
*
* @param qcCheckTaskProduce
* @return
*/
@ -28,7 +28,7 @@ public interface IQcCheckTaskProduceService {
/**
*
*
*
* @param qcCheckTaskProduce
* @return
*/
@ -36,7 +36,7 @@ public interface IQcCheckTaskProduceService {
/**
*
*
*
* @param qcCheckTaskProduce
* @return
*/
@ -44,7 +44,7 @@ public interface IQcCheckTaskProduceService {
/**
*
*
*
* @param recordIds
* @return
*/
@ -52,9 +52,11 @@ public interface IQcCheckTaskProduceService {
/**
*
*
*
* @param recordId
* @return
*/
public int deleteQcCheckTaskProduceByRecordId(String recordId);
List<QcCheckTaskProduce> getQcListWorkCenter(QcCheckTaskProduce qcCheckTaskProduce);
}

@ -94,4 +94,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
public int deleteQcCheckTaskProduceByRecordId(String recordId) {
return qcCheckTaskProduceMapper.deleteQcCheckTaskProduceByRecordId(recordId);
}
@Override
public List<QcCheckTaskProduce> getQcListWorkCenter(QcCheckTaskProduce qcCheckTaskProduce) {
return null;
}
}

@ -63,6 +63,7 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
public int insertQcCheckProject(QcCheckProject qcCheckProject) {
if (StringUtils.isNotBlank(qcCheckProject.getRuleName())){
qcCheckProject.setId(IdUtils.fastSimpleUUID());
qcCheckProject.setOrderNum(getOrderNum());
qcCheckProject.setCreateBy(SecurityUtils.getUsername());
qcCheckProject.setCreateTime(DateUtils.getNowDate());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@ -111,4 +112,13 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService {
public int deleteQcCheckProjectById(String id) {
return qcCheckProjectMapper.deleteQcCheckProjectById(id);
}
private String getOrderNum() {
String orderNum = "";
String now = DateUtils.getDate();
now = now.replace("-","");
QcCheckProject checkProject = qcCheckProjectMapper.selectSerialNumber();
orderNum = now + "0" + checkProject.getSerialNumber();
return orderNum;
}
}

@ -6,7 +6,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import org.apache.catalina.security.SecurityUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.quality.mapper.QcCheckTypeProjectMapper;

@ -107,6 +107,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS
}
@Override
@DS("#header.poolName")
public boolean validationData(String materialCode) {
return qcMaterialGroupDetailMapper.validationData(materialCode).size() > 0;
}

@ -174,6 +174,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService {
}
@Override
@DS("#header.poolName")
public boolean validationData(String id) {
return qcMaterialGroupMapper.validationData(id).size() > 0;
}

@ -30,6 +30,7 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService {
private QcUserMaterialMapper qcUserMaterialMapper;
@Override
@DS("#header.poolName")
public List<QcUserMaterial> selectUserList(QcUserMaterial qcUserMaterial) {
return qcUserMaterialMapper.selectUserList( qcUserMaterial);
}

@ -116,4 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<select id="selectSerialNumber" resultType="com.op.quality.domain.QcCheckProject">
SELECT COUNT(id)+1 AS serialNumber
FROM qc_check_project
WHERE del_flag = '0'
</select>
</mapper>

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.quality.mapper.QcCheckTaskProduceMapper">
<resultMap type="QcCheckTaskProduce" id="QcCheckTaskProduceResult">
<result property="recordId" column="record_id" />
<result property="checkNo" column="check_no" />
@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectQcCheckTaskProduceList" parameterType="QcCheckTaskProduce" resultMap="QcCheckTaskProduceResult">
<include refid="selectQcCheckTaskProduceVo"/>
<where>
<where>
<if test="checkNo != null and checkNo != ''"> and check_no = #{checkNo}</if>
<if test="batchNo != null and batchNo != ''"> and batch_no = #{batchNo}</if>
<if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
@ -64,14 +64,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="produceDateStart != null "> and CONVERT(varchar(30),produce_date, 120) >= #{produceDateStart}</if>
<if test="produceDateEnd != null "> and #{produceDateEnd} > CONVERT(varchar(30),produce_date, 120)</if>
<if test="checkTimeStart != null "> and CONVERT(varchar(30),check_time, 120) >= #{checkTimeStart}</if>
<if test="checkTimeEnd != null "> and #{checkTimeEnd} > CONVERT(varchar(30),check_time, 120)</if>
</where>
</select>
<select id="selectQcCheckTaskProduceByRecordId" parameterType="String" resultMap="QcCheckTaskProduceResult">
<include refid="selectQcCheckTaskProduceVo"/>
where record_id = #{recordId}
</select>
<insert id="insertQcCheckTaskProduce" parameterType="QcCheckTaskProduce">
insert into qc_check_task_produce
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -175,9 +179,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteQcCheckTaskProduceByRecordIds" parameterType="String">
delete from qc_check_task_produce where record_id in
delete from qc_check_task_produce where record_id in
<foreach item="recordId" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
</mapper>
</mapper>

@ -156,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupId != null">group_id,</if>
<if test="materialCode != null">material_code,</if>
<if test="sampleNum != null">sample_num</if>
<if test="projectNo != null">project_no</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -175,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null">#{delFlag},</if>
<if test="groupId != null">#{groupId},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="sampleNum != null">#{sampleNum}</if>
<if test="projectNo != null">#{projectNo}</if>
</trim>
</insert>
@ -199,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupId != null">group_id = #{groupId},</if>
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="sampleNum != null">sample_num = #{sampleNum}</if>
<if test="projectNo != null">project_no = #{projectNo}</if>
</trim>
where id = #{id}
</update>

@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<select id="validationData" parameterType="String">
<select id="validationData" parameterType="String" resultMap="QcMaterialGroupDetailResult">
select
id,
create_by,

@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<select id="validationData" parameterType="String">
<select id="validationData" parameterType="String" resultMap="QcMaterialGroupResult">
select
id,
create_by,

@ -0,0 +1,108 @@
package com.op.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.system.domain.BaseApkFile;
import com.op.system.service.IBaseApkFileService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* apkController
*
* @author Open Platform
* @date 2023-10-24
*/
@RestController
@RequestMapping("/apkFile")
public class BaseApkFileController extends BaseController {
@Autowired
private IBaseApkFileService baseApkFileService;
/**
* apk
*/
@RequiresPermissions("system:apkFile:list")
@GetMapping("/list")
public TableDataInfo list(BaseApkFile baseApkFile) {
startPage();
List<BaseApkFile> list = baseApkFileService.selectBaseApkFileList(baseApkFile);
return getDataTable(list);
}
/**
* apk
*/
@RequiresPermissions("system:apkFile:export")
@Log(title = "手持apk版本控制", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseApkFile baseApkFile) {
List<BaseApkFile> list = baseApkFileService.selectBaseApkFileList(baseApkFile);
ExcelUtil<BaseApkFile> util = new ExcelUtil<BaseApkFile>(BaseApkFile.class);
util.exportExcel(response, list, "手持apk版本控制数据");
}
/**
* apk
*/
@RequiresPermissions("system:apkFile:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(baseApkFileService.selectBaseApkFileById(id));
}
/**
* apk
*/
@RequiresPermissions("system:apkFile:add")
@Log(title = "手持apk版本控制", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseApkFile baseApkFile) {
return toAjax(baseApkFileService.insertBaseApkFile(baseApkFile));
}
/**
* apk
*/
@RequiresPermissions("system:apkFile:edit")
@Log(title = "手持apk版本控制", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseApkFile baseApkFile) {
return toAjax(baseApkFileService.updateBaseApkFile(baseApkFile));
}
/**
* apk
*/
@RequiresPermissions("system:apkFile:remove")
@Log(title = "手持apk版本控制", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(baseApkFileService.deleteBaseApkFileByIds(ids));
}
/**手持请求**/
@PostMapping("/getLastApkVersion")
public AjaxResult getLastApkVersion(@RequestBody BaseApkFile baseApkFile) {
return success(baseApkFileService.getLastApkVersion(baseApkFile));
}
}

@ -0,0 +1,123 @@
package com.op.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* apk base_apk_file
*
* @author Open Platform
* @date 2023-10-24
*/
public class BaseApkFile extends BaseEntity {
private static final long serialVersionUID = 1L;
/** ID */
private String id;
/** 文件名称 */
@Excel(name = "文件名称")
private String fileName;
/** 文件地址 */
@Excel(name = "文件地址")
private String fileAddress;
/** 版本号 */
@Excel(name = "版本号")
private String version;
/** 备用1 */
@Excel(name = "备用1")
private String attr1;
/** 备用2 */
@Excel(name = "备用2")
private String attr2;
/** 备用3 */
@Excel(name = "备用3")
private String attr3;
/** 备用4 */
@Excel(name = "备用4")
private String attr4;
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getFileName() {
return fileName;
}
public void setFileAddress(String fileAddress) {
this.fileAddress = fileAddress;
}
public String getFileAddress() {
return fileAddress;
}
public void setVersion(String version) {
this.version = version;
}
public String getVersion() {
return version;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
public String getAttr3() {
return attr3;
}
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("fileName", getFileName())
.append("fileAddress", getFileAddress())
.append("version", getVersion())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

@ -0,0 +1,65 @@
package com.op.system.mapper;
import java.util.List;
import com.op.system.domain.BaseApkFile;
import org.apache.ibatis.annotations.Mapper;
/**
* apkMapper
*
* @author Open Platform
* @date 2023-10-24
*/
@Mapper
public interface BaseApkFileMapper {
/**
* apk
*
* @param id apk
* @return apk
*/
public BaseApkFile selectBaseApkFileById(String id);
/**
* apk
*
* @param baseApkFile apk
* @return apk
*/
public List<BaseApkFile> selectBaseApkFileList(BaseApkFile baseApkFile);
/**
* apk
*
* @param baseApkFile apk
* @return
*/
public int insertBaseApkFile(BaseApkFile baseApkFile);
/**
* apk
*
* @param baseApkFile apk
* @return
*/
public int updateBaseApkFile(BaseApkFile baseApkFile);
/**
* apk
*
* @param id apk
* @return
*/
public int deleteBaseApkFileById(String id);
/**
* apk
*
* @param ids
* @return
*/
public int deleteBaseApkFileByIds(String[] ids);
BaseApkFile getLastApkVersion(BaseApkFile baseApkFile);
}

@ -0,0 +1,62 @@
package com.op.system.service;
import java.util.List;
import com.op.system.domain.BaseApkFile;
/**
* apkService
*
* @author Open Platform
* @date 2023-10-24
*/
public interface IBaseApkFileService {
/**
* apk
*
* @param id apk
* @return apk
*/
public BaseApkFile selectBaseApkFileById(String id);
/**
* apk
*
* @param baseApkFile apk
* @return apk
*/
public List<BaseApkFile> selectBaseApkFileList(BaseApkFile baseApkFile);
/**
* apk
*
* @param baseApkFile apk
* @return
*/
public int insertBaseApkFile(BaseApkFile baseApkFile);
/**
* apk
*
* @param baseApkFile apk
* @return
*/
public int updateBaseApkFile(BaseApkFile baseApkFile);
/**
* apk
*
* @param ids apk
* @return
*/
public int deleteBaseApkFileByIds(String[] ids);
/**
* apk
*
* @param id apk
* @return
*/
public int deleteBaseApkFileById(String id);
BaseApkFile getLastApkVersion(BaseApkFile baseApkFile);
}

@ -0,0 +1,98 @@
package com.op.system.service.impl;
import java.util.List;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.system.mapper.BaseApkFileMapper;
import com.op.system.domain.BaseApkFile;
import com.op.system.service.IBaseApkFileService;
/**
* apkService
*
* @author Open Platform
* @date 2023-10-24
*/
@Service
public class BaseApkFileServiceImpl implements IBaseApkFileService {
@Autowired
private BaseApkFileMapper baseApkFileMapper;
/**
* apk
*
* @param id apk
* @return apk
*/
@Override
public BaseApkFile selectBaseApkFileById(String id) {
return baseApkFileMapper.selectBaseApkFileById(id);
}
/**
* apk
*
* @param baseApkFile apk
* @return apk
*/
@Override
public List<BaseApkFile> selectBaseApkFileList(BaseApkFile baseApkFile) {
return baseApkFileMapper.selectBaseApkFileList(baseApkFile);
}
/**
* apk
*
* @param baseApkFile apk
* @return
*/
@Override
public int insertBaseApkFile(BaseApkFile baseApkFile) {
baseApkFile.setId(IdUtils.fastSimpleUUID());
baseApkFile.setCreateTime(DateUtils.getNowDate());
return baseApkFileMapper.insertBaseApkFile(baseApkFile);
}
/**
* apk
*
* @param baseApkFile apk
* @return
*/
@Override
public int updateBaseApkFile(BaseApkFile baseApkFile) {
baseApkFile.setUpdateTime(DateUtils.getNowDate());
return baseApkFileMapper.updateBaseApkFile(baseApkFile);
}
/**
* apk
*
* @param ids apk
* @return
*/
@Override
public int deleteBaseApkFileByIds(String[] ids) {
return baseApkFileMapper.deleteBaseApkFileByIds(ids);
}
/**
* apk
*
* @param id apk
* @return
*/
@Override
public int deleteBaseApkFileById(String id) {
return baseApkFileMapper.deleteBaseApkFileById(id);
}
@Override
public BaseApkFile getLastApkVersion(BaseApkFile baseApkFile) {
return baseApkFileMapper.getLastApkVersion(baseApkFile);
}
}

@ -0,0 +1,117 @@
<?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.op.system.mapper.BaseApkFileMapper">
<resultMap type="BaseApkFile" id="BaseApkFileResult">
<result property="id" column="id" />
<result property="fileName" column="file_name" />
<result property="fileAddress" column="file_address" />
<result property="version" column="version" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectBaseApkFileVo">
select id, file_name, file_address, version, attr1, attr2, attr3, attr4,
create_by, create_time, update_by, update_time, remark
from base_apk_file
</sql>
<select id="selectBaseApkFileList" parameterType="BaseApkFile" resultMap="BaseApkFileResult">
<include refid="selectBaseApkFileVo"/>
<where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileAddress != null and fileAddress != ''"> and file_address = #{fileAddress}</if>
<if test="version != null and version != ''"> and version like concat('%', #{version}, '%')</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
<if test="attr4 != null and attr4 != ''"> and attr4 = #{attr4}</if>
</where>
order by create_time desc
</select>
<select id="selectBaseApkFileById" parameterType="String" resultMap="BaseApkFileResult">
<include refid="selectBaseApkFileVo"/>
where id = #{id}
</select>
<select id="getLastApkVersion" resultType="com.op.system.domain.BaseApkFile">
select top 1 id, file_name, file_address, version, attr1, attr2, attr3, attr4,
create_by, create_time, update_by, update_time, remark
from base_apk_file
order by create_by create_by desc
</select>
<insert id="insertBaseApkFile" parameterType="BaseApkFile" useGeneratedKeys="true" keyProperty="id">
insert into base_apk_file
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="fileName != null">file_name,</if>
<if test="fileAddress != null">file_address,</if>
<if test="version != null">version,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="fileName != null">#{fileName},</if>
<if test="fileAddress != null">#{fileAddress},</if>
<if test="version != null">#{version},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateBaseApkFile" parameterType="BaseApkFile">
update base_apk_file
<trim prefix="SET" suffixOverrides=",">
<if test="fileName != null">file_name = #{fileName},</if>
<if test="fileAddress != null">file_address = #{fileAddress},</if>
<if test="version != null">version = #{version},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBaseApkFileById" parameterType="String">
delete from base_apk_file where id = #{id}
</delete>
<delete id="deleteBaseApkFileByIds" parameterType="String">
delete from base_apk_file where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save