WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-03-22 22:20:18 +08:00
parent e92b3a30b9 bd6912b229
commit e8c9839ea5
6 changed files with 234 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+28 -14
View File
@@ -1,28 +1,29 @@
package com.jero.modules.ota.controller; package com.jero.modules.ota.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaCxList;
import com.jero.modules.ota.service.IOtaBaCxListService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaCxList;
import com.jero.modules.ota.service.IOtaBaCxListService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletRequest;
import com.jero.common.aspect.annotation.AutoLog; import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/** /**
* @Description: 车型及功能备案列表 * @Description: 车型及功能备案列表
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-17 * @Date: 2023-03-17
@@ -167,4 +168,17 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
return super.importExcel(request, response, OtaBaCxList.class); return super.importExcel(request, response, OtaBaCxList.class);
} }
}
/**
* 备案维护
*
*/
@AutoLog(value = "车型及功能备案列表-备案维护")
@ApiOperation(value="车型及功能备案列表-备案维护", notes="车型及功能备案列表-备案维护")
@PutMapping(value = "/batchRecord")
public Result<?> batchRecord(@RequestBody List<OtaBaCxList> recordList) {
otaBaCxListService.batchRecord(recordList);
return Result.OK("备案维护成功!");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+26 -13
View File
@@ -1,28 +1,29 @@
package com.jero.modules.ota.controller; package com.jero.modules.ota.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaSjList;
import com.jero.modules.ota.service.IOtaBaSjListService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.ota.entity.OtaBaSjList;
import com.jero.modules.ota.service.IOtaBaSjListService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletRequest;
import com.jero.common.aspect.annotation.AutoLog; import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/** /**
* @Description: 升级备案-升级活动备案列表 * @Description: 升级备案-升级活动备案列表
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-17 * @Date: 2023-03-17
@@ -167,4 +168,16 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
return super.importExcel(request, response, OtaBaSjList.class); return super.importExcel(request, response, OtaBaSjList.class);
} }
/**
* 备案维护
*
*/
@AutoLog(value = "升级备案-备案维护")
@ApiOperation(value="升级备案-备案维护", notes="升级备案-备案维护")
@PutMapping(value = "/batchRecord")
public Result<?> batchRecord(@RequestBody List<OtaBaSjList> recordList) {
otaBaSjListService.batchRecord(recordList);
return Result.OK("备案维护成功!");
}
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaCxListService.java
+8 -1
View File
@@ -1,7 +1,8 @@
package com.jero.modules.ota.service; package com.jero.modules.ota.service;
import com.jero.modules.ota.entity.OtaBaCxList;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.ota.entity.OtaBaCxList;
import java.util.List; import java.util.List;
/** /**
@@ -58,4 +59,10 @@ public interface IOtaBaCxListService extends IService<OtaBaCxList> {
* @return * @return
*/ */
List<OtaBaCxList> queryList(); List<OtaBaCxList> queryList();
/**
* 备案维护
*
*/
void batchRecord(List<OtaBaCxList> recordList);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java
+8 -1
View File
@@ -1,7 +1,8 @@
package com.jero.modules.ota.service; package com.jero.modules.ota.service;
import com.jero.modules.ota.entity.OtaBaSjList;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.ota.entity.OtaBaSjList;
import java.util.List; import java.util.List;
/** /**
@@ -58,4 +59,10 @@ public interface IOtaBaSjListService extends IService<OtaBaSjList> {
* @return * @return
*/ */
List<OtaBaSjList> queryList(); List<OtaBaSjList> queryList();
/**
* 备案维护
*
*/
void batchRecord(List<OtaBaSjList> recordList);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java
+82 -45
View File
@@ -1,29 +1,40 @@
package com.jero.modules.ota.service.impl; package com.jero.modules.ota.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.entity.OtaBaCxList;
import com.jero.modules.ota.entity.OtaBaCxLsjl;
import com.jero.modules.ota.mapper.OtaBaCxListMapper; import com.jero.modules.ota.mapper.OtaBaCxListMapper;
import com.jero.modules.ota.service.IOtaBaCxListService; import com.jero.modules.ota.service.IOtaBaCxListService;
import com.jero.modules.ota.service.IOtaBaCxLsjlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List;
/** /**
* @Description: 车型及功能备案列表 * @Description: 车型及功能备案列表
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-17 * @Date: 2023-03-17
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBaCxList> implements IOtaBaCxListService { public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBaCxList> implements IOtaBaCxListService {
/** private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
* 保存
* @Autowired
* @param otaBaCxList private IOtaBaCxLsjlService otaBaCxLsjlService;
* @return
*/ /**
@Override * 保存
*
* @param otaBaCxList
* @return
*/
@Override
public void add(OtaBaCxList otaBaCxList) { public void add(OtaBaCxList otaBaCxList) {
Date now = new Date(); Date now = new Date();
otaBaCxList.setCreateTime(now); otaBaCxList.setCreateTime(now);
@@ -31,59 +42,85 @@ public class OtaBaCxListServiceImpl extends ServiceImpl<OtaBaCxListMapper, OtaBa
save(otaBaCxList); save(otaBaCxList);
} }
/** /**
* 更新 * 更新
* *
* @param otaBaCxList * @param otaBaCxList
* @return * @return
*/ */
@Override @Override
public void editById(OtaBaCxList otaBaCxList) { public void editById(OtaBaCxList otaBaCxList) {
Date now = new Date(); Date now = new Date();
otaBaCxList.setUpdateTime(now); otaBaCxList.setUpdateTime(now);
saveOrUpdate(otaBaCxList); saveOrUpdate(otaBaCxList);
} }
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
removeById(id); removeById(id);
} }
/** /**
* 批量删除 * 批量删除
* *
* @param ids * @param ids
* @return * @return
*/ */
@Override @Override
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
removeByIds(ids); removeByIds(ids);
} }
/** /**
* 通过id查询 * 通过id查询
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public OtaBaCxList queryById(String id) { public OtaBaCxList queryById(String id) {
return getById(id); return getById(id);
} }
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
@Override @Override
public List<OtaBaCxList> queryList() { public List<OtaBaCxList> queryList() {
return list(); return list();
} }
/**
* 备案维护
*/
@Override
public void batchRecord(List<OtaBaCxList> recordList) {
try {
if (null != recordList && recordList.size() > 0) {
for (OtaBaCxList obc : recordList) {
String id = obc.getId();
OtaBaCxList otaBaCxList = this.queryById(id);
otaBaCxList.setBatjsj(obc.getBatjsj());
otaBaCxList.setBz(obc.getBz());
this.saveOrUpdate(otaBaCxList);
//添加历史记录数据
OtaBaCxLsjl lsjl = new OtaBaCxLsjl();
lsjl.setOtaId(id);
lsjl.setSjzt(obc.getBz());
otaBaCxLsjlService.add(lsjl);
}
}
} catch (Exception ex) {
ex.printStackTrace();
throw new JeroBootException(ex.getMessage());
}
}
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java
+82 -45
View File
@@ -1,29 +1,40 @@
package com.jero.modules.ota.service.impl; package com.jero.modules.ota.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjList;
import com.jero.modules.ota.entity.OtaBaSjLsjl;
import com.jero.modules.ota.mapper.OtaBaSjListMapper; import com.jero.modules.ota.mapper.OtaBaSjListMapper;
import com.jero.modules.ota.service.IOtaBaSjListService; import com.jero.modules.ota.service.IOtaBaSjListService;
import com.jero.modules.ota.service.IOtaBaSjLsjlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List;
/** /**
* @Description: 升级备案-升级活动备案列表 * @Description: 升级备案-升级活动备案列表
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-03-17 * @Date: 2023-03-17
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBaSjList> implements IOtaBaSjListService { public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBaSjList> implements IOtaBaSjListService {
/** private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
* 保存
* @Autowired
* @param otaBaSjList private IOtaBaSjLsjlService otaBaSjLsjlService;
* @return
*/ /**
@Override * 保存
*
* @param otaBaSjList
* @return
*/
@Override
public void add(OtaBaSjList otaBaSjList) { public void add(OtaBaSjList otaBaSjList) {
Date now = new Date(); Date now = new Date();
otaBaSjList.setCreateTime(now); otaBaSjList.setCreateTime(now);
@@ -31,59 +42,85 @@ public class OtaBaSjListServiceImpl extends ServiceImpl<OtaBaSjListMapper, OtaBa
save(otaBaSjList); save(otaBaSjList);
} }
/** /**
* 更新 * 更新
* *
* @param otaBaSjList * @param otaBaSjList
* @return * @return
*/ */
@Override @Override
public void editById(OtaBaSjList otaBaSjList) { public void editById(OtaBaSjList otaBaSjList) {
Date now = new Date(); Date now = new Date();
otaBaSjList.setUpdateTime(now); otaBaSjList.setUpdateTime(now);
saveOrUpdate(otaBaSjList); saveOrUpdate(otaBaSjList);
} }
/** /**
* 通过id删除 * 通过id删除
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
removeById(id); removeById(id);
} }
/** /**
* 批量删除 * 批量删除
* *
* @param ids * @param ids
* @return * @return
*/ */
@Override @Override
public void deleteByIds(List<String> ids) { public void deleteByIds(List<String> ids) {
removeByIds(ids); removeByIds(ids);
} }
/** /**
* 通过id查询 * 通过id查询
* *
* @param id * @param id
* @return * @return
*/ */
@Override @Override
public OtaBaSjList queryById(String id) { public OtaBaSjList queryById(String id) {
return getById(id); return getById(id);
} }
/** /**
* 列表查询 * 列表查询
* *
* @return * @return
*/ */
@Override @Override
public List<OtaBaSjList> queryList() { public List<OtaBaSjList> queryList() {
return list(); return list();
} }
/**
* 备案维护
*/
@Override
public void batchRecord(List<OtaBaSjList> recordList) {
try {
if (null != recordList && recordList.size() > 0) {
for (OtaBaSjList obs : recordList) {
String id = obs.getId();
OtaBaSjList otaBaSjList = this.queryById(id);
otaBaSjList.setBatjsj(obs.getBatjsj());
otaBaSjList.setBz(obs.getBz());
this.saveOrUpdate(otaBaSjList);
//添加历史记录数据
OtaBaSjLsjl lsjl = new OtaBaSjLsjl();
lsjl.setOtaId(id);
lsjl.setSjzt(obs.getBz());
otaBaSjLsjlService.add(lsjl);
}
}
} catch (Exception ex) {
ex.printStackTrace();
throw new JeroBootException(ex.getMessage());
}
}
} }