dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

硬件商城

Browse Source
This commit is contained in:
愉快的大福 2024-07-23 23:17:12 +08:00
parent bcfbf9f75d
commit 2db9410149
67 changed files with 1717 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -27,9 +27,9 @@
<el-select v-model="queryParams.status" style="width: 150px" placeholder="全部">
<el-option
v-for="dict in dict.type.hardware_status"
:key="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -76,6 +76,20 @@
icon="el-icon-view"
@click="edit(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-top"
v-if="scope.row.status == 0 "
@click="shangjia(scope.row)"
>上架</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-bottom"
v-if="scope.row.status == 1 "
@click="shangjia(scope.row)"
>下架</el-button>
<el-button
size="mini"
type="text"
@ -270,6 +284,17 @@ export default {
this.open = true;
this.title = "新增商品"
},
shangjia(data){
if(data.status == 0){
data.status =1
}else {
data.status =0
}
this.changeStatus(data)
},
edit(e) {
this.clean()
this.open = true;

46
fuintAdmin_zt/src/views/setting/message.vue
View File

@ -12,24 +12,15 @@
/>
</el-form-item>
<el-form-item label="请选择接收角色" prop="roleIds">
<el-select v-model="queryParams.roleIds" style="width: 150px" placeholder="全部">
<el-option
v-for="dict in dict.type.hardware_type"
:key="dict.label"
:label="dict.label"
:value="dict.label"
/>
</el-select>
</el-form-item>
<el-form-item label="请选择短信模版状态" prop="status">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="全部">
<el-form-item label="" prop="status">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="短信模版状态">
<el-option
v-for="dict in dict.type.message_status"
:key="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
@ -55,7 +46,7 @@
<!-- <ImagePreview :src="scope.row.image"></ImagePreview>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="deptIds" label="适用范围"></el-table-column>
<el-table-column prop="deptNames" label="适用范围"></el-table-column>
<!-- <el-table-column prop="roleIds" label="接收角色"></el-table-column>-->
<el-table-column prop="status" label="短信状态">
@ -106,8 +97,8 @@
<el-form-item label="短信名称" prop="name">
<el-input v-model="form.name" style="width: 300px"></el-input>
</el-form-item>
<el-form-item label="适用范围" prop="storeId">
<el-select v-model="form.deptIds" placeholder="请选择所属机构" style="width: 300px" >
<el-form-item label="适用范围" prop="deptIdList">
<el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px" >
<el-option
v-for="item in deptListSelect"
:key="item.deptId"
@ -117,8 +108,13 @@
</el-select>
</el-form-item>
<el-form-item label="即时配送">
<el-switch v-model="form.status"></el-switch>
<el-form-item label="状态" prop="status">
<el-switch
v-model="form.status"
active-value="1"
inactive-value="0">
</el-switch>
</el-form-item>
<!-- <el-form-item label="适用角色" prop="categoryName">-->
@ -152,7 +148,7 @@ import {selectChildByDeptId} from "@/api/system/Site/site";
export default {
name: "printIndex",
dicts: ['dept_ids','role_ids'],
dicts: ['dept_ids','message_status'],
data() {
return {
tableData: [],
@ -197,14 +193,8 @@ export default {
name: [
{ required: true, message: "短信名称不能为空", trigger: "blur" }
],
categoryName: [
{ required: true, message: "短信分类不能为空", trigger: "blur" }
],
formStore: [
{ required: true, message: "采购商家不能为空", trigger: "blur" }
],
image: [
{ required: true, message: "短信图片不能为空", trigger: "blur" }
deptIdList: [
{ required: true, message: "适用范围不能为空", trigger: "blur" }
],
content: [
{ required: true, message: "短信介绍不能为空", trigger: "blur" }

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/controller/StaffCommissionController.java
View File

@ -71,8 +71,8 @@ public class StaffCommissionController extends BaseController {
StaffCommission staffCommission = commissionService.getById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("短信模版");
sysLog.setContent("删除了模版名称为"+staffCommission.getName()+"的数据");
sysLog.setMoudle("提成方案");
sysLog.setContent("删除了方案名称为"+staffCommission.getName()+"的数据");
sysLogService.saveVo(sysLog);
commissionService.deleteCommissionById(id);
return getSuccessResult("操作成功");
@ -89,7 +89,7 @@ public class StaffCommissionController extends BaseController {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("提成方案");
sysLog.setContent("新增了一条数据");
sysLog.setContent("增加了方案名称为"+commission.getName()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(row);
}
@ -105,7 +105,7 @@ public class StaffCommissionController extends BaseController {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("提成方案");
sysLog.setContent("修改了方案名称为"+commission.getName()+"的方案");
sysLog.setContent("更新了方案名称为"+commission.getName()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(row);
}

21
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java
View File

@ -6,6 +6,8 @@ import com.fuint.business.convenienceSore.entity.CvsGoods;
import com.fuint.business.convenienceSore.service.CvsGoodsService;
import com.fuint.business.convenienceSore.vo.CvsGoodsTree;
import com.fuint.business.convenienceSore.vo.CvsGoodsVo;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,11 +24,18 @@ public class CvsGoodsController extends BaseController {
@Autowired
private CvsGoodsService cvsGoodsService;
@Autowired
private SysLogService sysLogService;
/**新增商品分类类别*/
@PostMapping("/addCvsGoods")
public ResponseObject insertCvsGoods( @RequestBody CvsGoods goods){
int i = cvsGoodsService.insertCvsGoods(goods);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品分类");
sysLog.setContent("新增了分类名称为"+goods.getName()+"的数据");
sysLogService.saveVo(sysLog);
if(i == -1){
return getSuccessResult(-1);
}else {
@ -82,7 +91,12 @@ public class CvsGoodsController extends BaseController {
@DeleteMapping("/{id}")
public ResponseObject selectDeleteId(@PathVariable Integer id)
{
CvsGoods cvsGoods = cvsGoodsService.getById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品分类");
sysLog.setContent("删除了分类名称为"+cvsGoods.getName()+"的数据");
sysLogService.saveVo(sysLog);
cvsGoodsService.deleteByIdVo(id);
return getSuccessResult("删除成功");
@ -96,6 +110,11 @@ public class CvsGoodsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@Validated @RequestBody CvsGoods goods){
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品分类");
sysLog.setContent("更新了分类名称为"+goods.getName()+"的数据");
sysLogService.saveVo(sysLog);
int row = cvsGoodsService.updateCvsGood(goods);
return getSuccessResult(row);
}

25
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
View File

@ -7,6 +7,8 @@ import com.fuint.business.convenienceSore.dto.LJGoodsDto;
import com.fuint.business.convenienceSore.entity.LJGoods;
import com.fuint.business.convenienceSore.service.LJGoodsService;
import com.fuint.business.convenienceSore.vo.LjGoodsVo;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
@ -25,6 +27,8 @@ import java.util.Map;
public class LJGoodsController extends BaseController {
@Autowired
private LJGoodsService goodsService;
@Autowired
private SysLogService sysLogService;
/**
* 根据条件查询商品信息 传参page、pageSize、商品是否在回收站isRecovery：0不在、1在
@ -113,6 +117,12 @@ public class LJGoodsController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject remove(@PathVariable Integer id){
LJGoods goods = goodsService.getById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品信息");
sysLog.setContent("删除了商品名称为"+goods.getName()+"的数据");
sysLogService.saveVo(sysLog);
goodsService.deleteLJGoodsById(id);
return getSuccessResult("操作成功");
}
@ -124,6 +134,11 @@ public class LJGoodsController extends BaseController {
*/
@PostMapping
public ResponseObject add(@Validated @RequestBody LJGoods goods){
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品信息");
sysLog.setContent("新增了商品名称为"+goods.getName()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(goodsService.insertLJGoods(goods));
}
@ -134,6 +149,11 @@ public class LJGoodsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@Validated @RequestBody LJGoods goods){
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品信息");
sysLog.setContent("更新了商品名称为"+goods.getName()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(goodsService.updateLJGoods(goods));
}
@ -156,6 +176,11 @@ public class LJGoodsController extends BaseController {
*/
@PostMapping("editGoodsInventory")
public ResponseObject editGoodsInventory(@RequestBody LJGoodsDto goods){
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品信息");
sysLog.setContent("更新了商品名称为"+goods.getName()+"的库存");
sysLogService.saveVo(sysLog);
return getSuccessResult(goodsService.editGoodsInventory(goods));
}

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtDamageController.java
View File

@ -6,8 +6,11 @@ import com.fuint.business.convenienceSore.entity.MtDamage;
import com.fuint.business.convenienceSore.entity.MtDamageDetails;
import com.fuint.business.convenienceSore.service.MtDamageService;
import com.fuint.business.convenienceSore.vo.MtDamageVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
@ -29,6 +32,8 @@ public class MtDamageController extends BaseController {
*/
@Resource
private MtDamageService mtDamageService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -72,6 +77,11 @@ public class MtDamageController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody MtDamage mtDamage) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损信息");
sysLog.setContent("新增了业务单号为"+mtDamage.getOrderNumber()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageService.insert(mtDamage));
}
@ -83,6 +93,11 @@ public class MtDamageController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody MtDamage mtDamage) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损信息");
sysLog.setContent("更新了业务单号为"+mtDamage.getOrderNumber()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageService.update(mtDamage));
}
@ -94,6 +109,12 @@ public class MtDamageController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
MtDamage mtDamage = mtDamageService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损信息");
sysLog.setContent("删除了业务单号为"+mtDamage.getOrderNumber()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageService.deleteById(id));
}
@ -107,16 +128,34 @@ public class MtDamageController extends BaseController {
*/
@GetMapping("audit")
public ResponseObject audit(Integer id) {
MtDamage mtDamage = mtDamageService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损信息");
sysLog.setContent("审核了业务单号为"+mtDamage.getOrderNumber()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageService.audit(id));
}
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
MtDamage mtDamage = mtDamageService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损信息");
sysLog.setContent("废除了业务单号为"+mtDamage.getOrderNumber()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageService.abolition(id));
}
@GetMapping("storage")
public ResponseObject storage(Integer id) {
MtDamage mtDamage = mtDamageService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损信息");
sysLog.setContent("入库了业务单号为"+mtDamage.getOrderNumber()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageService.storage(id));
}

32
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtDamageDetailsController.java
View File

@ -6,8 +6,11 @@ import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.service.MtDamageDetailsService;
import com.fuint.business.convenienceSore.vo.MtDamageDetailsVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
@ -31,6 +34,8 @@ public class MtDamageDetailsController extends BaseController {
*/
@Resource
private MtDamageDetailsService mtDamageDetailsService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -76,6 +81,11 @@ public class MtDamageDetailsController extends BaseController {
*/
@PostMapping
public ResponseObject add(MtDamageDetails mtDamageDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损详情");
sysLog.setContent("增加了油站报损详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageDetailsService.insert(mtDamageDetails));
}
@ -87,6 +97,11 @@ public class MtDamageDetailsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(MtDamageDetails mtDamageDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损详情");
sysLog.setContent("更新了油站报损详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageDetailsService.update(mtDamageDetails));
}
@ -98,22 +113,35 @@ public class MtDamageDetailsController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损详情");
sysLog.setContent("删除了油站报损详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageDetailsService.deleteById(id));
}
/**
* 批量处理数据
*
* @param mtPurchaseDetails 实体
* @return 新增结果
*/
@PostMapping("batchProcessing")
public ResponseObject batchProcessing(@RequestBody List<MtDamageDetails> mtDamageDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损详情");
sysLog.setContent("批量处理了油站报损详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtDamageDetailsService.batchProcessing(mtDamageDetails));
}
@PostMapping("exportExcel")
public void exportExcel(HttpServletResponse response, @RequestBody MtDamageDetails mtDamageDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站报损详情");
sysLog.setContent("导出了油站报损详情的数据");
sysLogService.saveVo(sysLog);
this.mtDamageDetailsService.export(response,mtDamageDetails);
}

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryController.java
View File

@ -7,8 +7,11 @@ import com.fuint.business.convenienceSore.entity.MtInventory;
import com.fuint.business.convenienceSore.service.MtInventoryService;
import com.fuint.business.convenienceSore.vo.MtInventoryVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -27,6 +30,8 @@ public class MtInventoryController extends BaseController {
*/
@Resource
private MtInventoryService mtInventoryService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -72,6 +77,11 @@ public class MtInventoryController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody MtInventory mtInventory) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点");
sysLog.setContent("新增了单号为"+mtInventory.getOrderNumber()+"商品盘点的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryService.insert(mtInventory));
}
@ -83,6 +93,11 @@ public class MtInventoryController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody MtInventory mtInventory) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点");
sysLog.setContent("更新了单号为"+mtInventory.getOrderNumber()+"商品盘点的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryService.update(mtInventory));
}
@ -94,6 +109,12 @@ public class MtInventoryController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
MtInventory mtInventory = mtInventoryService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点");
sysLog.setContent("删除了单号为"+mtInventory.getOrderNumber()+"商品盘点的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryService.deleteById(id));
}
@ -105,16 +126,34 @@ public class MtInventoryController extends BaseController {
*/
@GetMapping("audit")
public ResponseObject audit(Integer id) {
MtInventory mtInventory = mtInventoryService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点");
sysLog.setContent("审核了单号为"+mtInventory.getOrderNumber()+"商品盘点的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryService.audit(id));
}
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
MtInventory mtInventory = mtInventoryService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点");
sysLog.setContent("废除了单号为"+mtInventory.getOrderNumber()+"商品盘点的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryService.abolition(id));
}
@GetMapping("storage")
public ResponseObject storage(Integer id) {
MtInventory mtInventory = mtInventoryService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点");
sysLog.setContent("入库了单号为"+mtInventory.getOrderNumber()+"商品盘点的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryService.storage(id));
}

30
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryDetailsController.java
View File

@ -6,8 +6,11 @@ import com.fuint.business.convenienceSore.entity.MtInventoryDetails;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.service.MtInventoryDetailsService;
import com.fuint.business.convenienceSore.vo.MtInventoryDetailsVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
@ -31,6 +34,8 @@ public class MtInventoryDetailsController extends BaseController {
*/
@Resource
private MtInventoryDetailsService mtInventoryDetailsService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -84,6 +89,11 @@ public class MtInventoryDetailsController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody MtInventoryDetails mtInventoryDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点详情");
sysLog.setContent("新增了商品盘点详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryDetailsService.insert(mtInventoryDetails));
}
@ -95,6 +105,11 @@ public class MtInventoryDetailsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody MtInventoryDetails mtInventoryDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点详情");
sysLog.setContent("更新了商品盘点详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryDetailsService.update(mtInventoryDetails));
}
@ -106,6 +121,11 @@ public class MtInventoryDetailsController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点详情");
sysLog.setContent("删除了商品盘点详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryDetailsService.deleteById(id));
}
@ -117,11 +137,21 @@ public class MtInventoryDetailsController extends BaseController {
*/
@PostMapping("batchProcessing")
public ResponseObject batchProcessing(@RequestBody List<MtInventoryDetails> mtPurchaseDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点详情");
sysLog.setContent("批量处理了商品盘点详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtInventoryDetailsService.batchProcessing(mtPurchaseDetails));
}
@PostMapping("exportExcel")
public void exportExcel(HttpServletResponse response, @RequestBody MtInventoryDetails mtPurchaseDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品盘点详情");
sysLog.setContent("导出了商品盘点详情的数据");
sysLogService.saveVo(sysLog);
this.mtInventoryDetailsService.export(response,mtPurchaseDetails);
}

40
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java
View File

@ -6,8 +6,11 @@ import com.fuint.business.convenienceSore.dto.MtPurchaseDto;
import com.fuint.business.convenienceSore.entity.MtPurchase;
import com.fuint.business.convenienceSore.service.MtPurchaseService;
import com.fuint.business.convenienceSore.vo.MtPurchaseVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -27,7 +30,8 @@ public class MtPurchaseController extends BaseController {
*/
@Resource
private MtPurchaseService mtPurchaseService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
*
@ -81,6 +85,11 @@ public class MtPurchaseController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody MtPurchase mtPurchase) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品进货");
sysLog.setContent("新增了单号为"+mtPurchase.getOrderNumber()+"商品进货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseService.insert(mtPurchase));
}
@ -92,6 +101,11 @@ public class MtPurchaseController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody MtPurchase mtPurchase) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品进货");
sysLog.setContent("更新了单号为"+mtPurchase.getOrderNumber()+"商品进货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseService.update(mtPurchase));
}
@ -103,6 +117,12 @@ public class MtPurchaseController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
MtPurchase mtPurchase = mtPurchaseService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品进货");
sysLog.setContent("删除了单号为"+mtPurchase.getOrderNumber()+"商品进货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseService.deleteById(id));
}
@ -114,6 +134,12 @@ public class MtPurchaseController extends BaseController {
*/
@GetMapping("audit")
public ResponseObject audit(Integer id) {
MtPurchase mtPurchase = mtPurchaseService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品进货");
sysLog.setContent("审核了单号为"+mtPurchase.getOrderNumber()+"商品进货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseService.audit(id));
}
@ -124,6 +150,12 @@ public class MtPurchaseController extends BaseController {
*/
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
MtPurchase mtPurchase = mtPurchaseService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品进货");
sysLog.setContent("废除了单号为"+mtPurchase.getOrderNumber()+"商品进货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseService.abolition(id));
}
@ -134,6 +166,12 @@ public class MtPurchaseController extends BaseController {
*/
@GetMapping("storage")
public ResponseObject storage(Integer id) {
MtPurchase mtPurchase = mtPurchaseService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品进货");
sysLog.setContent("入库了单号为"+mtPurchase.getOrderNumber()+"商品进货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseService.storage(id));
}

30
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseDetailsController.java
View File

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.service.MtPurchaseDetailsService;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -27,6 +30,8 @@ public class MtPurchaseDetailsController extends BaseController {
*/
@Resource
private MtPurchaseDetailsService mtPurchaseDetailsService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -72,6 +77,11 @@ public class MtPurchaseDetailsController extends BaseController {
*/
@PostMapping
public ResponseObject add(MtPurchaseDetails mtPurchaseDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("进货详情");
sysLog.setContent("增加了进货详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseDetailsService.insert(mtPurchaseDetails));
}
@ -84,6 +94,11 @@ public class MtPurchaseDetailsController extends BaseController {
*/
@PostMapping("batchProcessing")
public ResponseObject batchProcessing(@RequestBody List<MtPurchaseDetails> mtPurchaseDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("进货详情");
sysLog.setContent("批量处理了进货详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseDetailsService.batchProcessing(mtPurchaseDetails));
}
@ -95,6 +110,11 @@ public class MtPurchaseDetailsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(MtPurchaseDetails mtPurchaseDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("进货详情");
sysLog.setContent("更新了进货详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseDetailsService.update(mtPurchaseDetails));
}
@ -106,12 +126,22 @@ public class MtPurchaseDetailsController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("进货详情");
sysLog.setContent("删除了进货详情的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtPurchaseDetailsService.deleteById(id));
}
@PostMapping("exportExcel")
public void exportExcel(HttpServletResponse response,@RequestBody MtPurchaseDetails mtPurchaseDetails) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("进货详情");
sysLog.setContent("导出了进货详情的数据");
sysLogService.saveVo(sysLog);
this.mtPurchaseDetailsService.export(response,mtPurchaseDetails);
}

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtReturnsController.java
View File

@ -7,8 +7,11 @@ import com.fuint.business.convenienceSore.entity.MtReturns;
import com.fuint.business.convenienceSore.service.MtReturnsService;
import com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO;
import com.fuint.business.convenienceSore.vo.MtReturnsVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
@ -30,6 +33,8 @@ public class MtReturnsController extends BaseController {
*/
@Resource
private MtReturnsService mtReturnsService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -68,6 +73,11 @@ public class MtReturnsController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody MtReturns mtReturns) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品退货");
sysLog.setContent("新增了单号为"+mtReturns.getOrderNumber()+"商品退货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtReturnsService.insert(mtReturns));
}
@ -79,6 +89,11 @@ public class MtReturnsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody MtReturns mtReturns) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品退货");
sysLog.setContent("更新了单号为"+mtReturns.getOrderNumber()+"商品退货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtReturnsService.update(mtReturns));
}
@ -90,6 +105,12 @@ public class MtReturnsController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
MtReturns mtReturns = mtReturnsService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品退货");
sysLog.setContent("删除了单号为"+mtReturns.getOrderNumber()+"商品退货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtReturnsService.deleteById(id));
}
@ -101,16 +122,34 @@ public class MtReturnsController extends BaseController {
*/
@GetMapping("audit")
public ResponseObject audit(Integer id) {
MtReturns mtReturns = mtReturnsService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品退货");
sysLog.setContent("审核了单号为"+mtReturns.getOrderNumber()+"商品退货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtReturnsService.audit(id));
}
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
MtReturns mtReturns = mtReturnsService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品退货");
sysLog.setContent("废除了单号为"+mtReturns.getOrderNumber()+"商品退货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtReturnsService.abolition(id));
}
@GetMapping("storage")
public ResponseObject storage(Integer id) {
MtReturns mtReturns = mtReturnsService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品退货");
sysLog.setContent("入库了单号为"+mtReturns.getOrderNumber()+"商品退货的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.mtReturnsService.storage(id));
}

40
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtReturnsDetailsController.java
View File

@ -5,8 +5,11 @@ import com.fuint.business.convenienceSore.entity.MtPurchaseDetails;
import com.fuint.business.convenienceSore.entity.MtReturnsDetails;
import com.fuint.business.convenienceSore.service.MtReturnsDetailsService;
import com.fuint.business.convenienceSore.vo.MtReturnsDetailsVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
@ -30,6 +33,8 @@ public class MtReturnsDetailsController extends BaseController {
*/
@Resource
private MtReturnsDetailsService mtReturnsDetailsService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -76,6 +81,13 @@ public class MtReturnsDetailsController extends BaseController {
*/
@PostMapping
public ResponseEntity<MtReturnsDetails> add(@RequestParam MtReturnsDetails mtReturnsDetails) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("退货详情");
sysLog.setContent("增加了退货详情的数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return ResponseEntity.ok(this.mtReturnsDetailsService.insert(mtReturnsDetails));
}
@ -87,6 +99,13 @@ public class MtReturnsDetailsController extends BaseController {
*/
@PostMapping("batchProcessing")
public ResponseObject batchProcessing(@RequestBody List<MtReturnsDetails> mtReturnsDetails) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("退货详情");
sysLog.setContent("批量处理了退货详情的数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.mtReturnsDetailsService.batchProcessing(mtReturnsDetails));
}
/**
@ -97,6 +116,13 @@ public class MtReturnsDetailsController extends BaseController {
*/
@PutMapping
public ResponseEntity<MtReturnsDetails> edit(@RequestParam MtReturnsDetails mtReturnsDetails) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("退货详情");
sysLog.setContent("更新了退货详情的数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return ResponseEntity.ok(this.mtReturnsDetailsService.update(mtReturnsDetails));
}
@ -108,12 +134,26 @@ public class MtReturnsDetailsController extends BaseController {
*/
@DeleteMapping
public ResponseEntity<Boolean> deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("退货详情");
sysLog.setContent("删除了退货详情的数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return ResponseEntity.ok(this.mtReturnsDetailsService.deleteById(id));
}
@PostMapping("exportExcel")
public void exportExcel(HttpServletResponse response, @RequestBody MtReturnsDetails mtReturnsDetails) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("退货详情");
sysLog.setContent("导出了退货详情的数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
this.mtReturnsDetailsService.export(response,mtReturnsDetails);
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/SaleStatisticController.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.service.SaleStatisticService;
import com.fuint.business.convenienceSore.vo.SaleStatisticVo;
import com.fuint.business.convenienceSore.vo.StockStatisticVo;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@ -25,6 +27,8 @@ import java.util.List;
public class SaleStatisticController extends BaseController {
@Autowired
private SaleStatisticService saleService;
@Autowired
private SysLogService sysLogService;
/**
* 根据条件查询销售统计信息
@ -63,7 +67,13 @@ public class SaleStatisticController extends BaseController {
response.addHeader("Content-Disposition", "filename=" + filenames + ".xlsx");
List<SaleStatisticVo> list = saleService.selectSales(saleVo);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品-销售统计");
sysLog.setContent("导出销售统计信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
EasyExcel.write(response.getOutputStream(), SaleStatisticVo.class).sheet("sheet").doWrite(list);
} catch (Exception e) {
e.printStackTrace();

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/StockStatisticController.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.service.StockStatisticService;
import com.fuint.business.convenienceSore.vo.StockStatisticVo;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.userManager.listener.EasyExcelListener;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
@ -23,7 +25,7 @@ public class StockStatisticController extends BaseController {
@Autowired
private StockStatisticService stockService;
@Autowired
private EasyExcelListener listener;
private SysLogService sysLogService;
/**
* 根据条件查询库存商品信息
@ -66,7 +68,13 @@ public class StockStatisticController extends BaseController {
response.setContentType("application/json.ms-exce");
response.setCharacterEncoding("utf-8");
response.addHeader("Content-Disposition", "filename=" + filenames + ".xlsx");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品-库存统计");
sysLog.setContent("导出库存统计信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
List<StockStatisticVo> list = stockService.selectStocks(stockStatisticVo);
EasyExcel.write(response.getOutputStream(), StockStatisticVo.class).sheet("sheet").doWrite(list);

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/SupplierController.java
View File

@ -2,8 +2,11 @@ package com.fuint.business.convenienceSore.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.entity.MtReturns;
import com.fuint.business.convenienceSore.entity.Supplier;
import com.fuint.business.convenienceSore.service.SupplierService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@ -20,6 +23,8 @@ import java.util.Map;
public class SupplierController extends BaseController {
@Autowired
private SupplierService supplierService;
@Autowired
private SysLogService sysLogService;
/**
* 根据条件查询供应商信息
@ -76,6 +81,14 @@ public class SupplierController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject remove(@PathVariable Integer id){
Supplier supplier = supplierService.getById(id);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品供应商");
sysLog.setContent("删除了名称为"+supplier.getName()+"的供应商");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
supplierService.deleteSupplierById(id);
return getSuccessResult("操作成功");
}
@ -87,6 +100,13 @@ public class SupplierController extends BaseController {
*/
@PostMapping
public ResponseObject add(@Validated @RequestBody Supplier supplier){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品供应商");
sysLog.setContent("增加了名称为"+supplier.getName()+"的供应商");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(supplierService.insertSupplier(supplier));
}
@ -97,6 +117,13 @@ public class SupplierController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@Validated @RequestBody Supplier supplier){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("商品供应商");
sysLog.setContent("更新了名称为"+supplier.getName()+"的供应商");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(supplierService.updateSupplier(supplier));
}
}

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
View File

@ -19,6 +19,8 @@ import com.fuint.business.convenienceSore.service.LJGoodsService;
import com.fuint.business.convenienceSore.service.StockStatisticService;
import com.fuint.business.convenienceSore.service.StockTrackService;
import com.fuint.business.convenienceSore.vo.LjGoodsVo;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.RedisLock;
import com.fuint.common.util.StringUtils;
@ -48,6 +50,8 @@ public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> impl
private StockStatisticService stockService;
@Autowired
private StockTrackService trackService;
@Autowired
private SysLogService sysLogService;
/**
* 根据条件分页查询商品信息
@ -224,6 +228,11 @@ public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> impl
}else {
ljGoods.setStatus(status);
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("便利店商品信息");
sysLog.setContent("更新了商品名称为"+ljGoods.getName()+"的状态");
sysLogService.saveVo(sysLog);
this.updateLJGoods(ljGoods);
if (ljGoods.getStatus().equals("qy")) row += 1;
}

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptPriceInfoController.java
View File

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.deptPay.entity.DeptPriceInfo;
import com.fuint.business.deptPay.service.DeptPriceInfoService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +29,8 @@ public class DeptPriceInfoController extends BaseController {
*/
@Resource
private DeptPriceInfoService deptPriceInfoService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -64,6 +69,13 @@ public class DeptPriceInfoController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody DeptPriceInfo deptPriceInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构年付费配置");
sysLog.setContent("新增机构编号为"+deptPriceInfo.getDeptId()+"的年付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptPriceInfoService.insert(deptPriceInfo));
}
@ -75,6 +87,13 @@ public class DeptPriceInfoController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody DeptPriceInfo deptPriceInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构年付费配置");
sysLog.setContent("更新机构编号为"+deptPriceInfo.getDeptId()+"的年付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptPriceInfoService.update(deptPriceInfo));
}
@ -86,6 +105,14 @@ public class DeptPriceInfoController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
DeptPriceInfo deptPriceInfo = deptPriceInfoService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构年付费配置");
sysLog.setContent("删除机构编号为"+deptPriceInfo.getDeptId()+"的年付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptPriceInfoService.deleteById(id));
}

31
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptServiceFeeInfoController.java
View File

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.deptPay.entity.DeptServiceFeeInfo;
import com.fuint.business.deptPay.service.DeptServiceFeeInfoService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +29,8 @@ public class DeptServiceFeeInfoController extends BaseController {
*/
@Resource
private DeptServiceFeeInfoService deptServiceFeeInfoService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -46,6 +51,10 @@ public class DeptServiceFeeInfoController extends BaseController {
/**
*
*
*
*
* 通过主键查询单条数据
*
* @param id 主键
@ -64,6 +73,13 @@ public class DeptServiceFeeInfoController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody DeptServiceFeeInfo deptServiceFeeInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构后付费配置");
sysLog.setContent("新增机构编号为"+deptServiceFeeInfo.getDeptId()+"的后付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptServiceFeeInfoService.insert(deptServiceFeeInfo));
}
@ -75,6 +91,13 @@ public class DeptServiceFeeInfoController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody DeptServiceFeeInfo deptServiceFeeInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构后付费配置");
sysLog.setContent("更新机构编号为"+deptServiceFeeInfo.getDeptId()+"的后付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptServiceFeeInfoService.update(deptServiceFeeInfo));
}
@ -86,6 +109,14 @@ public class DeptServiceFeeInfoController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
DeptServiceFeeInfo deptServiceFeeInfo = deptServiceFeeInfoService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构后付费配置");
sysLog.setContent("删除机构编号为"+deptServiceFeeInfo.getDeptId()+"的后付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptServiceFeeInfoService.deleteById(id));
}

28
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/controller/DeptTransactionInfoController.java
View File

@ -2,10 +2,14 @@ package com.fuint.business.deptPay.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.deptPay.entity.DeptServiceFeeInfo;
import com.fuint.business.deptPay.entity.DeptTransactionInfo;
import com.fuint.business.deptPay.service.DeptTransactionInfoService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +30,8 @@ public class DeptTransactionInfoController extends BaseController {
*/
@Resource
private DeptTransactionInfoService deptTransactionInfoService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -64,6 +70,13 @@ public class DeptTransactionInfoController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody DeptTransactionInfo deptTransactionInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构后付费配置");
sysLog.setContent("新增机构编号为"+deptTransactionInfo.getDeptId()+"的预付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptTransactionInfoService.insert(deptTransactionInfo));
}
@ -75,6 +88,13 @@ public class DeptTransactionInfoController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody DeptTransactionInfo deptTransactionInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构后付费配置");
sysLog.setContent("更新机构编号为"+deptTransactionInfo.getDeptId()+"的预付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptTransactionInfoService.update(deptTransactionInfo));
}
@ -86,6 +106,14 @@ public class DeptTransactionInfoController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
DeptTransactionInfo deptTransactionInfo = deptTransactionInfoService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("机构后付费配置");
sysLog.setContent("删除机构编号为"+deptTransactionInfo.getDeptId()+"的预付费配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.deptTransactionInfoService.deleteById(id));
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
View File

@ -1,7 +1,10 @@
package com.fuint.business.indexBanner.controller;
import com.fuint.business.deptPay.entity.DeptTransactionInfo;
import com.fuint.business.indexBanner.entity.IndexBanner;
import com.fuint.business.indexBanner.service.IndexBannerService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -13,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
public class IndexBannerController extends BaseController {
@Autowired
private IndexBannerService indexBannerService;
@Autowired
private SysLogService sysLogService;
/**
* 根据店铺id查询首页轮播图列表
@ -56,6 +61,13 @@ public class IndexBannerController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody IndexBanner indexBanner){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("首页轮播图");
sysLog.setContent("新增首页轮播图数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(indexBannerService.insertIndexBanner(indexBanner,indexBanner.getStoreId()));
}
@ -66,6 +78,13 @@ public class IndexBannerController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody IndexBanner indexBanner){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("首页轮播图");
sysLog.setContent("更新首页轮播图数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(indexBannerService.updateIndexBanner(indexBanner));
}
@ -76,6 +95,13 @@ public class IndexBannerController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject delete(@PathVariable Integer id){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("首页轮播图");
sysLog.setContent("删除首页轮播图数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
indexBannerService.deleteIndexBanner(id);
return getSuccessResult("OK");
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralDetailController.java
View File

@ -78,6 +78,9 @@ public class IntegralDetailController extends BaseController {
/**
* 新增数据
*
*
*
*
* @param integralDetail 实体
* @return 新增结果
*/

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftCategoryController.java
View File

@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.integral.entity.IntegralGiftCategory;
import com.fuint.business.integral.service.IntegralGiftCategoryService;
import com.fuint.business.petrolStationManagement.entity.OilGun;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -28,6 +31,8 @@ public class IntegralGiftCategoryController extends BaseController {
*/
@Resource
private IntegralGiftCategoryService integralGiftCategoryService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -71,6 +76,13 @@ public class IntegralGiftCategoryController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody IntegralGiftCategory integralGiftCategory) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("礼品分类");
sysLog.setContent("新增礼品分类数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftCategoryService.insert(integralGiftCategory));
}
@ -82,6 +94,13 @@ public class IntegralGiftCategoryController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody IntegralGiftCategory integralGiftCategory) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("礼品分类");
sysLog.setContent("更新礼品分类数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftCategoryService.update(integralGiftCategory));
}
@ -93,6 +112,13 @@ public class IntegralGiftCategoryController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("礼品分类");
sysLog.setContent("删除礼品分类数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftCategoryService.deleteById(id));
}

35
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
View File

@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.integral.entity.IntegralGift;
import com.fuint.business.integral.service.IntegralGiftService;
import com.fuint.business.integral.vo.IntegralGiftVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -27,6 +30,8 @@ public class IntegralGiftController extends BaseController {
*/
@Resource
private IntegralGiftService integralGiftService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -83,6 +88,13 @@ public class IntegralGiftController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody IntegralGift integralGift) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分商品");
sysLog.setContent("新增名为"+integralGift.getGiftName()+"积分商品数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftService.insert(integralGift));
}
@ -94,6 +106,13 @@ public class IntegralGiftController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody IntegralGift integralGift) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分商品");
sysLog.setContent("更新名为"+integralGift.getGiftName()+"积分商品数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftService.update(integralGift));
}
@ -105,6 +124,14 @@ public class IntegralGiftController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
IntegralGift integralGift = integralGiftService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分商品");
sysLog.setContent("删除名为"+integralGift.getGiftName()+"积分商品数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftService.deleteById(id));
}
@ -116,6 +143,14 @@ public class IntegralGiftController extends BaseController {
*/
@GetMapping("updateInventory")
public ResponseObject updateInventory(@Param("id") Integer id,@Param("editInventory") Integer editInventory) {
try {
IntegralGift integralGift = integralGiftService.queryById(id);
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分商品");
sysLog.setContent("修改名为"+integralGift.getGiftName()+"积分商品库存");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralGiftService.updateInventory(id,editInventory));
}

29
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralSettingsController.java
View File

@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.integral.entity.IntegralGift;
import com.fuint.business.integral.entity.IntegralSettings;
import com.fuint.business.integral.service.IntegralSettingsService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -28,6 +31,8 @@ public class IntegralSettingsController extends BaseController {
*/
@Resource
private IntegralSettingsService integralSettingsService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -86,6 +91,14 @@ public class IntegralSettingsController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody IntegralSettings integralSettings) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分设置");
sysLog.setContent("新增积分规则");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralSettingsService.insert(integralSettings));
}
@ -97,6 +110,14 @@ public class IntegralSettingsController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody IntegralSettings integralSettings) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分设置");
sysLog.setContent("更新积分规则");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralSettingsService.update(integralSettings));
}
@ -108,6 +129,14 @@ public class IntegralSettingsController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("积分设置");
sysLog.setContent("删除积分规则");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.integralSettingsService.deleteById(id));
}

29
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/controller/ActiveAppletController.java
View File

@ -2,8 +2,11 @@ package com.fuint.business.marketingActivity.activeApplet.controller;
import com.fuint.business.marketingActivity.activeApplet.entity.ActiveApplet;
import com.fuint.business.marketingActivity.activeApplet.service.ActiveAppletService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -19,6 +22,8 @@ import java.util.List;
@RestController
@RequestMapping("business/marketingActivity/activeApplet")
public class ActiveAppletController extends BaseController {
@Autowired
private SysLogService sysLogService;
/**
* 服务对象
*/
@ -68,6 +73,14 @@ public class ActiveAppletController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveApplet activeApplet) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增油站活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeAppletService.save(activeApplet));
}
@ -79,6 +92,14 @@ public class ActiveAppletController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveApplet activeApplet) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新油站活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeAppletService.updateById(activeApplet));
}
@ -90,6 +111,14 @@ public class ActiveAppletController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除油站活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeAppletService.removeByIds(idList));
}
}

41
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
View File

@ -9,10 +9,13 @@ import com.fuint.business.marketingActivity.activeConsumption.dto.ActiveConsumpt
import com.fuint.business.marketingActivity.activeConsumption.entity.ActiveConsumption;
import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionChildService;
import com.fuint.business.marketingActivity.activeConsumption.service.ActiveConsumptionService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -38,6 +41,8 @@ public class ActiveConsumptionController extends BaseController {
private ActiveConsumptionChildService activeConsumptionChildService;
@Resource
private ActiveAppletService activeAppletService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -94,6 +99,14 @@ public class ActiveConsumptionController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveConsumptionDTO activeConsumptionDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+activeConsumptionDTO.getName()+"消费有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeConsumptionService.add(activeConsumptionDTO));
}
@ -105,6 +118,13 @@ public class ActiveConsumptionController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveConsumptionDTO activeConsumptionDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+activeConsumptionDTO.getName()+"消费有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeConsumptionService.updateOneById(activeConsumptionDTO));
}
@ -118,6 +138,13 @@ public class ActiveConsumptionController extends BaseController {
public ResponseObject edit(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新消费有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeConsumptionService.editIsLone(id, isonline));
}
@ -138,6 +165,13 @@ public class ActiveConsumptionController extends BaseController {
*/
@DeleteMapping("delById/{ids}")
public ResponseObject delete(@PathVariable Long ids) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除消费有礼活动编号为:"+ids);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
LambdaQueryWrapper<ActiveApplet> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(ActiveApplet::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());
queryWrapper1.eq(ActiveApplet::getActiveId,ids);
@ -153,6 +187,13 @@ public class ActiveConsumptionController extends BaseController {
*/
@DeleteMapping("del")
public ResponseObject del(@RequestParam("ids") Long ids) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除消费有礼活动编号为:"+ids);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(activeConsumptionChildService.removeById(ids));
}

49
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java
View File

@ -10,14 +10,19 @@ import com.fuint.business.marketingActivity.activeDiscount.dto.ActiveDiscountDTO
import com.fuint.business.marketingActivity.activeDiscount.entity.ActiveDiscount;
import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscountChildService;
import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscountService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -39,6 +44,8 @@ public class ActiveDiscountController extends BaseController {
private ActiveDiscountChildService activeDiscountChildService;
@Resource
private ActiveAppletService activeAppletService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -84,6 +91,13 @@ public class ActiveDiscountController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveDiscountDTO activeDiscountDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+activeDiscountDTO.getName()+"折扣营销活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeDiscountService.add(activeDiscountDTO));
}
@ -95,6 +109,13 @@ public class ActiveDiscountController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveDiscountDTO activeDiscountDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+activeDiscountDTO.getName()+"折扣营销活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeDiscountService.updateOneById(activeDiscountDTO));
}
@ -108,6 +129,13 @@ public class ActiveDiscountController extends BaseController {
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新折扣营销活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeDiscountService.updateIsOnline(id,isonline));
}
@ -119,6 +147,13 @@ public class ActiveDiscountController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除折扣营销活动编号为:"+ Collections.singletonList(idList));
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeDiscountService.removeByIds(idList));
}
@ -134,6 +169,13 @@ public class ActiveDiscountController extends BaseController {
queryWrapper1.eq(ActiveApplet::getActiveId,ids);
queryWrapper1.eq(ActiveApplet::getType,"3");
activeAppletService.remove(queryWrapper1);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除折扣营销活动编号为:"+ ids);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeDiscountService.removeById(ids));
}
@ -145,6 +187,13 @@ public class ActiveDiscountController extends BaseController {
*/
@DeleteMapping("del")
public ResponseObject del(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除折扣营销活动编号为:"+ Collections.singletonList(idList));
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(activeDiscountChildService.removeByIds(idList));
}
}

47
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java
View File

@ -11,10 +11,13 @@ import com.fuint.business.marketingActivity.activeDiscount.service.ActiveDiscoun
import com.fuint.business.marketingActivity.activeFullminus.dto.ActiveFullminusDTO;
import com.fuint.business.marketingActivity.activeFullminus.entity.ActiveFullminus;
import com.fuint.business.marketingActivity.activeFullminus.service.ActiveFullminusService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -40,6 +43,8 @@ public class ActiveFullminusController extends BaseController {
private ActiveDiscountChildService activeDiscountChildService;
@Resource
private ActiveAppletService activeAppletService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -85,6 +90,13 @@ public class ActiveFullminusController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveFullminusDTO activeFullminusDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+activeFullminusDTO.getName()+"满减营销活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeFullminusService.add(activeFullminusDTO));
}
@ -98,6 +110,13 @@ public class ActiveFullminusController extends BaseController {
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新满减营销活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeFullminusService.updateIsOnlone(id,isonline));
}
@ -109,6 +128,13 @@ public class ActiveFullminusController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveFullminusDTO activeFullminusDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+activeFullminusDTO.getName()+"满减营销活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeFullminusService.updateOneById(activeFullminusDTO));
}
@ -120,6 +146,13 @@ public class ActiveFullminusController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除满减营销活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeFullminusService.removeByIds(idList));
}
/**
@ -134,6 +167,13 @@ public class ActiveFullminusController extends BaseController {
queryWrapper1.eq(ActiveApplet::getActiveId,ids);
queryWrapper1.eq(ActiveApplet::getType,"4");
activeAppletService.remove(queryWrapper1);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除满减营销活动编号为:"+ids);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeFullminusService.removeById(ids));
}
/**
@ -144,6 +184,13 @@ public class ActiveFullminusController extends BaseController {
*/
@DeleteMapping("del")
public ResponseObject del(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除满减营销活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(activeDiscountChildService.removeByIds(idList));
}
}

47
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
View File

@ -11,10 +11,13 @@ import com.fuint.business.marketingActivity.activeNewlyweds.dto.ActiveNewlywedsD
import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlyweds;
import com.fuint.business.marketingActivity.activeNewlyweds.service.ActiveNewlywedsChildService;
import com.fuint.business.marketingActivity.activeNewlyweds.service.ActiveNewlywedsService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -40,6 +43,8 @@ public class ActiveNewlywedsController extends BaseController {
private ActiveNewlywedsChildService activeNewlywedsChildService;
@Resource
private ActiveAppletService activeAppletService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -84,6 +89,13 @@ public class ActiveNewlywedsController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveNewlywedsDTO activeNewlywedsDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+activeNewlywedsDTO.getName()+"新人有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeNewlywedsService.add(activeNewlywedsDTO));
}
@ -95,6 +107,13 @@ public class ActiveNewlywedsController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveNewlywedsDTO activeNewlywedsDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+activeNewlywedsDTO.getName()+"新人有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeNewlywedsService.updateOneById(activeNewlywedsDTO));
}
@ -106,6 +125,13 @@ public class ActiveNewlywedsController extends BaseController {
*/
@PostMapping("/edit")
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新新人有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
return getSuccessResult(this.activeNewlywedsService.updateIsonline(id,isonline));
@ -119,6 +145,13 @@ public class ActiveNewlywedsController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除消费有礼活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeNewlywedsService.removeByIds(idList));
}
@ -129,6 +162,13 @@ public class ActiveNewlywedsController extends BaseController {
*/
@DeleteMapping("delById/{ids}")
public ResponseObject delete(@PathVariable Integer ids) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除消费有礼活动编号为:"+ids);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
LambdaQueryWrapper<ActiveApplet> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(ActiveApplet::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());
queryWrapper1.eq(ActiveApplet::getActiveId,ids);
@ -145,6 +185,13 @@ public class ActiveNewlywedsController extends BaseController {
*/
@DeleteMapping("del")
public ResponseObject del(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除消费有礼活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(activeNewlywedsChildService.removeByIds(idList));
}
}

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
View File

@ -7,9 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.activeOneCoupon.dtos.ActiveOneCouponDTO;
import com.fuint.business.marketingActivity.activeOneCoupon.entity.ActiveOneCoupon;
import com.fuint.business.marketingActivity.activeOneCoupon.service.ActiveOneCouponService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -30,6 +33,8 @@ public class ActiveOneCouponController extends BaseController {
*/
@Resource
private ActiveOneCouponService activeOneCouponService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -64,6 +69,13 @@ public class ActiveOneCouponController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveOneCouponDTO activeOneCouponDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+activeOneCouponDTO.getActiveName()+"一键发券活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeOneCouponService.add(activeOneCouponDTO));
}
@ -75,6 +87,13 @@ public class ActiveOneCouponController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveOneCouponDTO activeOneCouponDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+activeOneCouponDTO.getActiveName()+"一键发券活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeOneCouponService.updateOneById(activeOneCouponDTO));
}
@ -86,6 +105,13 @@ public class ActiveOneCouponController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除一键发券活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeOneCouponService.removeByIds(idList));
}
@ -96,6 +122,13 @@ public class ActiveOneCouponController extends BaseController {
*/
@DeleteMapping("/delById/{id}")
public ResponseObject deleteById(@PathVariable Long id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除一键发券活动编号为:"+id);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeOneCouponService.removeById(id));
}

47
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendController.java
View File

@ -13,10 +13,13 @@ import com.fuint.business.marketingActivity.activeRecommend.dto.ActiveRecommendD
import com.fuint.business.marketingActivity.activeRecommend.entity.ActiveRecommend;
import com.fuint.business.marketingActivity.activeRecommend.service.ActiveRecommendChildService;
import com.fuint.business.marketingActivity.activeRecommend.service.ActiveRecommendService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -42,6 +45,8 @@ public class ActiveRecommendController extends BaseController {
private ActiveRecommendChildService activeRecommendChildService;
@Resource
private ActiveAppletService activeAppletService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -87,6 +92,13 @@ public class ActiveRecommendController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveRecommendDTO activeRecommendDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+activeRecommendDTO.getActiveName()+"推荐有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeRecommendService.add(activeRecommendDTO));
}
@ -100,6 +112,13 @@ public class ActiveRecommendController extends BaseController {
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新推荐有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeRecommendService.updateIsonline(id,isonline));
}
@ -111,6 +130,13 @@ public class ActiveRecommendController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody ActiveRecommendDTO activeRecommendDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+activeRecommendDTO.getActiveName()+"推荐有礼活动");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeRecommendService.updateOneById(activeRecommendDTO));
}
@ -122,6 +148,13 @@ public class ActiveRecommendController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除推荐有礼活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeRecommendService.removeByIds(idList));
}
/**
@ -136,6 +169,13 @@ public class ActiveRecommendController extends BaseController {
queryWrapper1.eq(ActiveApplet::getActiveId,ids);
queryWrapper1.eq(ActiveApplet::getType,"7");
activeAppletService.remove(queryWrapper1);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除推荐有礼活动编号为:"+ids);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.activeRecommendService.removeById(ids));
}
@ -147,6 +187,13 @@ public class ActiveRecommendController extends BaseController {
*/
@DeleteMapping("del")
public ResponseObject del(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除推荐有礼活动编号为:"+idList);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(activeRecommendChildService.removeByIds(idList));
}
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java
View File

@ -5,9 +5,12 @@ package com.fuint.business.marketingActivity.cardExchange.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardExchange.entity.CardExchange;
import com.fuint.business.marketingActivity.cardExchange.service.CardExchangeService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -28,6 +31,8 @@ public class CardExchangeController extends BaseController {
*/
@Resource
private CardExchangeService cardExchangeService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -63,6 +68,13 @@ public class CardExchangeController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody CardExchange cardExchange) throws Exception {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增兑换券");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardExchangeService.add(cardExchange));
}
@ -82,6 +94,13 @@ public class CardExchangeController extends BaseController {
}else {
cardExchange.setCardDetail("可兑换-"+"洗车券");
}
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新兑换券");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardExchangeService.updateById(cardExchange));
}
@ -93,6 +112,13 @@ public class CardExchangeController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject delete(@PathVariable Long id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除兑换券编号为"+id);
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardExchangeService.removeById(id));
}
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableController.java
View File

@ -7,9 +7,12 @@ import com.fuint.business.marketingActivity.cardFavorable.dto.CardFavorableDTO;
import com.fuint.business.marketingActivity.cardFavorable.dto.CardFavorableDTOS;
import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable;
import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -30,6 +33,8 @@ public class CardFavorableController extends BaseController {
*/
@Resource
private CardFavorableService cardFavorableService;
@Autowired
private SysLogService sysLogService;
/**分页查询所有数据
*
@ -80,6 +85,13 @@ public class CardFavorableController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody CardFavorableDTO cardFavorableDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增名称为"+cardFavorableDTO.getName()+"的优惠券");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFavorableService.add(cardFavorableDTO));
}
@ -91,6 +103,13 @@ public class CardFavorableController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody CardFavorableDTO cardFavorableDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新名称为"+cardFavorableDTO.getName()+"的优惠券");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFavorableService.updateOneById(cardFavorableDTO));
}
@ -102,6 +121,13 @@ public class CardFavorableController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject delete(@PathVariable Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除编号为"+id+"的优惠券");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFavorableService.removeById(id));
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelChangeController.java
View File

@ -7,8 +7,11 @@ import com.fuint.business.marketingActivity.cardFule.service.CardFuelChangeServi
import com.fuint.business.marketingActivity.cardFule.vo.CardFuelChangeVo;
import com.fuint.business.order.entity.CardBalanceChange;
import com.fuint.business.order.vo.CardBalanceChangeVo;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -74,6 +77,7 @@ public class CardFuelChangeController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody CardFuelChange cardFuelChange) {
return getSuccessResult(this.cardFuelChangeService.insert(cardFuelChange));
}

25
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java
View File

@ -12,6 +12,8 @@ import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel;
import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService;
import com.fuint.business.petrolStationManagement.entity.OilName;
import com.fuint.business.petrolStationManagement.service.OilNameService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.store.service.StoreService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
@ -48,6 +50,8 @@ public class CardFuelDieselController extends BaseController {
private OilNameService oilNameService;
@Resource
private ActiveAppletService activeAppletService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -171,6 +175,13 @@ public class CardFuelDieselController extends BaseController {
activeApplet.setName("囤油卡充值活动");
activeApplet.setType("2");
activeAppletService.save(activeApplet);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增柴油囤油卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(save);
}
@ -235,6 +246,13 @@ public class CardFuelDieselController extends BaseController {
activeAppletService.updateById(activeApplet);
if (ObjectUtil.isEmpty(cardFuelDiesel.getExpireTime()))
this.cardFuelDieselService.lambdaUpdate().eq(CardFuelDiesel::getId,cardFuelDiesel.getId()).set(CardFuelDiesel::getExpireTime,null).update();
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新柴油囤油卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel));
}
@ -252,6 +270,13 @@ public class CardFuelDieselController extends BaseController {
queryWrapper1.eq(ActiveApplet::getActiveId,id);
queryWrapper1.eq(ActiveApplet::getType,"2");
activeAppletService.remove(queryWrapper1);
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除柴油囤油卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFuelDieselService.removeById(id));
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelGasolineController.java
View File

@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel;
import com.fuint.business.marketingActivity.cardFule.entity.CardFuelGasoline;
import com.fuint.business.marketingActivity.cardFule.service.CardFuelGasolineService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.store.service.StoreService;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -37,6 +40,8 @@ public class CardFuelGasolineController extends BaseController {
private CardFuelGasolineService cardFuelGasolineService;
@Resource
private StoreService storeService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -79,6 +84,13 @@ public class CardFuelGasolineController extends BaseController {
cardFuelGasoline.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
cardFuelGasoline.setChainStorId(storeService.getById(TokenUtil.getNowAccountInfo().getStoreId()).getChainStoreId());
}
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增汽油囤油卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFuelGasolineService.save(cardFuelGasoline));
}
@ -90,6 +102,13 @@ public class CardFuelGasolineController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody CardFuelGasoline cardFuelGasoline) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新汽油囤油卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFuelGasolineService.updateById(cardFuelGasoline));
}
@ -101,6 +120,13 @@ public class CardFuelGasolineController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除汽油囤油卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardFuelGasolineService.removeByIds(idList));
}
}

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java
View File

@ -7,6 +7,8 @@ import com.fuint.business.marketingActivity.cardGift.entity.CardGift;
import com.fuint.business.marketingActivity.cardGift.service.CardGiftService;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.userManager.entity.LJUser;
import com.fuint.business.userManager.service.LJUserService;
import com.fuint.common.dto.AccountInfo;
@ -16,6 +18,7 @@ import com.fuint.framework.web.ResponseObject;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -46,6 +49,8 @@ public class CardGiftController extends BaseController {
@Resource
private ILJStaffService ljStaffService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -96,6 +101,13 @@ public class CardGiftController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody CardGift cardGift) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增礼品卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardGiftService.insert(cardGift));
}
@ -113,6 +125,13 @@ public class CardGiftController extends BaseController {
if (ObjectUtils.isNotEmpty(ljStaff) && StringUtils.isNotEmpty(ljStaff.getRealName())){
cardGift.setCreateBy(ljStaff.getRealName());
}
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新礼品卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardGiftService.updateById(cardGift));
}
@ -124,6 +143,13 @@ public class CardGiftController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除礼品卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardGiftService.removeByIds(idList));
}
@ -188,6 +214,13 @@ public class CardGiftController extends BaseController {
*/
@RequestMapping("/exchangeImport")
public ResponseObject exchangeImport(MultipartFile file) throws IOException {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("导入礼品卡信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardGiftService.exchangeImport(file));
}

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
View File

@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.service.CardValueService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -28,6 +31,8 @@ public class CardValueController extends BaseController {
*/
@Resource
private CardValueService cardValueService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -94,6 +99,13 @@ public class CardValueController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody CardValueDTO cardValueDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("新增储值卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardValueService.add(cardValueDTO));
}
@ -105,6 +117,13 @@ public class CardValueController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody CardValueDTO cardValueDTO) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新储值卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardValueService.updateOneById(cardValueDTO));
}
@ -116,6 +135,13 @@ public class CardValueController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除编号为"+idList+"的储值卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardValueService.removeByIds(idList));
}
@ -127,6 +153,13 @@ public class CardValueController extends BaseController {
*/
@DeleteMapping("delById")
public ResponseObject delById(@RequestParam("id") Long id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("删除编号为"+id+"的储值卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardValueService.delById(id));
}
}

25
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
@ -24,6 +26,8 @@ import java.util.Map;
public class LJStaffController extends BaseController {
@Autowired
private ILJStaffService mtStaffService;
@Autowired
private SysLogService sysLogService;
/**
* 根据条件分页查询员工信息
@ -128,6 +132,13 @@ public class LJStaffController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject remove(@PathVariable Integer id){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("员工管理");
sysLog.setContent("删除编号为"+id+"的员工信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
mtStaffService.deleteStaffById(id);
return getSuccessResult("操作成功");
}
@ -139,6 +150,13 @@ public class LJStaffController extends BaseController {
*/
@PostMapping
public ResponseObject add(@Validated @RequestBody LJStaff staff){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("员工管理");
sysLog.setContent("新增名称为"+staff.getRealName()+"的员工信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(mtStaffService.insertStaff(staff));
}
@ -151,6 +169,13 @@ public class LJStaffController extends BaseController {
public ResponseObject edit(@Validated @RequestBody LJStaff staff){
if (ObjectUtil.isEmpty(staff.getAuditPrem()))
mtStaffService.lambdaUpdate().eq(LJStaff::getId,staff.getId()).set(LJStaff::getAuditPrem,null).update();
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("员工管理");
sysLog.setContent("更新名称为"+staff.getRealName()+"的员工信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(mtStaffService.updateStaff(staff));
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java
View File

@ -2,6 +2,8 @@ package com.fuint.business.member.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.member.service.ILJDutyService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import com.fuint.system.role.entity.TDuty;

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/oilDepotConfiguration/controller/OilDepotConfigController.java
View File

@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.oilDepotConfiguration.entity.OilDepotConfig;
import com.fuint.business.oilDepotConfiguration.service.OilDepotConfigService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -29,6 +32,8 @@ public class OilDepotConfigController extends BaseController {
*/
@Resource
private OilDepotConfigService oilDepotConfigService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据

25
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CreditUnitController.java
View File

@ -3,6 +3,8 @@ package com.fuint.business.order.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.order.entity.CreditUnit;
import com.fuint.business.order.service.CreditUnitService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@ -14,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
public class CreditUnitController extends BaseController {
@Autowired
private CreditUnitService creditUnitService;
@Autowired
private SysLogService sysLogService;
/**
* 查询所有挂账单位信息
@ -67,6 +71,13 @@ public class CreditUnitController extends BaseController {
*/
@PostMapping
private ResponseObject add(@Validated @RequestBody CreditUnit creditUnit){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("挂账单位");
sysLog.setContent("新增名称为"+creditUnit.getUnitName()+"的挂账单位");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(creditUnitService.insertCreditUnit(creditUnit));
}
@ -77,6 +88,13 @@ public class CreditUnitController extends BaseController {
*/
@PutMapping
private ResponseObject edit(@Validated @RequestBody CreditUnit creditUnit){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("挂账单位");
sysLog.setContent("更新名称为"+creditUnit.getUnitName()+"的挂账单位");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(creditUnitService.updateCreditUnit(creditUnit));
}
@ -97,6 +115,13 @@ public class CreditUnitController extends BaseController {
*/
@DeleteMapping("{id}")
private ResponseObject delete(@PathVariable Integer id){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("挂账单位");
sysLog.setContent("删除编号为"+id+"的挂账单位");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(creditUnitService.deleteCreditUnitById(id));
}
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilGunController.java
View File

@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilGun;
import com.fuint.business.petrolStationManagement.service.OilGunService;
import com.fuint.business.petrolStationManagement.vo.OilGunVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -29,6 +32,8 @@ public class OilGunController extends BaseController {
*/
@Resource
private OilGunService oilGunService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -80,6 +85,13 @@ public class OilGunController extends BaseController {
@PostMapping
public ResponseObject add(@RequestBody OilGun oilGun) {
if (this.oilGunService.insert(oilGun)) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油枪管理");
sysLog.setContent("新增名称为"+oilGun.getGunName()+"的油枪信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(true);
}else {
return getSuccessResult(201,"存在重复的油枪名称，请修改",null);
@ -95,6 +107,13 @@ public class OilGunController extends BaseController {
@PutMapping
public ResponseObject edit(@RequestBody OilGun oilGun) {
if (this.oilGunService.update(oilGun)){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油枪管理");
sysLog.setContent("更新名称为"+oilGun.getGunName()+"的油枪信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilGunService.update(oilGun));
}else {
return getSuccessResult(201,"存在重复的油枪名称，请修改",null);
@ -109,6 +128,13 @@ public class OilGunController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油枪管理");
sysLog.setContent("删除编号为"+id+"的油枪信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilGunService.deleteById(id));
}

22
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilInventoryController.java
View File

@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilInventory;
import com.fuint.business.petrolStationManagement.service.OilInventoryService;
import com.fuint.business.petrolStationManagement.vo.OilInventoryVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -27,6 +30,8 @@ public class OilInventoryController extends BaseController {
*/
@Resource
private OilInventoryService oilInventoryService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -73,6 +78,13 @@ public class OilInventoryController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody OilInventory oilInventory) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油品盘点");
sysLog.setContent("新增单号为"+oilInventory.getInventoryNumber()+"的盘点信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilInventoryService.insert(oilInventory));
}
@ -84,6 +96,11 @@ public class OilInventoryController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody OilInventory oilInventory) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油品盘点");
sysLog.setContent("修改单号为"+oilInventory.getInventoryNumber()+"的盘点信息");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.oilInventoryService.update(oilInventory));
}
@ -95,6 +112,11 @@ public class OilInventoryController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油品盘点");
sysLog.setContent("删除编号为"+id+"的盘点信息");
sysLogService.saveVo(sysLog);
return getSuccessResult(this.oilInventoryService.deleteById(id));
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilInventoryOrderController.java
View File

@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilInventoryOrder;
import com.fuint.business.petrolStationManagement.service.OilInventoryOrderService;
import com.fuint.business.petrolStationManagement.vo.OilInventoryOrderVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -29,6 +32,8 @@ public class OilInventoryOrderController extends BaseController {
*/
@Resource
private OilInventoryOrderService oilInventoryOrderService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNumberController.java
View File

@ -13,10 +13,13 @@ import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import com.fuint.business.petrolStationManagement.service.OilNumberService;
import com.fuint.business.petrolStationManagement.service.OilPresetPricesService;
import com.fuint.business.petrolStationManagement.vo.OilPresetPricesVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -38,6 +41,8 @@ public class OilNumberController extends BaseController {
*/
@Resource
private OilNumberService oilPresetPricesService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -93,6 +98,13 @@ public class OilNumberController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody OilNumber oilNumber) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油号信息");
sysLog.setContent("新增油号为"+oilNumber.getOilName()+"的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.insertOilNumber(oilNumber));
}
@ -104,6 +116,13 @@ public class OilNumberController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody OilNumber oilNumber) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油号信息");
sysLog.setContent("修改油号为"+oilNumber.getOilName()+"的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.updateOilNumber(oilNumber));
}
@ -114,6 +133,13 @@ public class OilNumberController extends BaseController {
*/
@DeleteMapping("/{id}")
public ResponseObject delete(@PathVariable Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油号信息");
sysLog.setContent("删除油号编号为"+id+"的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.deleteOilNumberById(id));
}

40
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilPresetPricesController.java
View File

@ -11,10 +11,13 @@ import com.fuint.business.petrolStationManagement.entity.OilNumber;
import com.fuint.business.petrolStationManagement.entity.OilPresetPrices;
import com.fuint.business.petrolStationManagement.service.OilNumberService;
import com.fuint.business.petrolStationManagement.service.OilPresetPricesService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -36,6 +39,8 @@ public class OilPresetPricesController extends BaseController {
*/
@Resource
private OilPresetPricesService oilPresetPricesService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询所有数据
@ -71,6 +76,13 @@ public class OilPresetPricesController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody OilPresetPrices oilNumber) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("预设油价");
sysLog.setContent("新增预设油价的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.insertOilPresetPrices(oilNumber));
}
@ -82,6 +94,13 @@ public class OilPresetPricesController extends BaseController {
*/
@PutMapping
public ResponseObject update(@RequestBody OilPresetPrices oilNumber) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("预设油价");
sysLog.setContent("更新预设油价的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.updateOilPresetPrices(oilNumber));
}
@ -92,6 +111,13 @@ public class OilPresetPricesController extends BaseController {
*/
@DeleteMapping
public ResponseObject delete(@PathVariable Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("预设油价");
sysLog.setContent("删除预设油价的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.deleteOilPresetPricesById(id));
}
@ -100,6 +126,13 @@ public class OilPresetPricesController extends BaseController {
*/
@GetMapping("editStart")
public ResponseObject editStart(Long id){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("预设油价");
sysLog.setContent("启动预设油价的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(oilPresetPricesService.editStart(id));
}
@ -113,6 +146,13 @@ public class OilPresetPricesController extends BaseController {
if (i<=0) {
return getFailureResult("停止失败");
}
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("预设油价");
sysLog.setContent("停止预设油价的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult("停止成功");
}
}

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilPurchaseController.java
View File

@ -9,11 +9,14 @@ import com.fuint.business.petrolStationManagement.entity.OilPurchaseOrder;
import com.fuint.business.petrolStationManagement.entity.OilTank;
import com.fuint.business.petrolStationManagement.service.OilPurchaseService;
import com.fuint.business.petrolStationManagement.vo.OilPurchaseVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -35,6 +38,8 @@ public class OilPurchaseController extends BaseController {
*/
@Resource
private OilPurchaseService oilPurchaseService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -102,7 +107,13 @@ public class OilPurchaseController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody OilPurchase oilPurchase) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("新增油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseService.insert(oilPurchase));
}
@ -119,6 +130,13 @@ public class OilPurchaseController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody OilPurchase oilPurchase) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("更新油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseService.update(oilPurchase));
}
@ -130,6 +148,13 @@ public class OilPurchaseController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("删除油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseService.deleteById(id));
}

54
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilPurchaseOrderController.java
View File

@ -6,10 +6,13 @@ import com.fuint.business.petrolStationManagement.entity.OilInventoryOrder;
import com.fuint.business.petrolStationManagement.entity.OilPurchaseOrder;
import com.fuint.business.petrolStationManagement.service.OilPurchaseOrderService;
import com.fuint.business.petrolStationManagement.vo.OilPurchaseOrderVO;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.dev.ReSave;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -29,6 +32,8 @@ public class OilPurchaseOrderController extends BaseController {
*/
@Resource
private OilPurchaseOrderService oilPurchaseOrderService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -82,6 +87,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody OilPurchaseOrder oilPurchaseOrder) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("新增油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.insert(oilPurchaseOrder));
}
@ -92,6 +104,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@PostMapping("disposeBatch")
public ResponseObject disposeBatch(@RequestBody List<OilPurchaseOrder> oilPurchaseOrders) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("批量处理油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.disposeBatch(oilPurchaseOrders));
}
@ -103,6 +122,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody OilPurchaseOrder oilPurchaseOrder) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("更新油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.update(oilPurchaseOrder));
}
@ -114,6 +140,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("删除油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.deleteById(id));
}
@ -124,6 +157,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@GetMapping("audit")
public ResponseObject audit(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("审核油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.audit(id));
}
@ -134,6 +174,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@GetMapping("abolition")
public ResponseObject abolition(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("废除油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.abolition(id));
}
@ -144,6 +191,13 @@ public class OilPurchaseOrderController extends BaseController {
*/
@GetMapping("storage")
public ResponseObject storage(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("入库油站进油的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilPurchaseOrderService.storage(id));
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilSuppliersController.java
View File

@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilSuppliers;
import com.fuint.business.petrolStationManagement.service.OilSuppliersService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -26,6 +29,8 @@ public class OilSuppliersController extends BaseController {
*/
@Resource
private OilSuppliersService oilSuppliersService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -68,6 +73,13 @@ public class OilSuppliersController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody OilSuppliers oilSuppliers) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("新增油站供应商的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilSuppliersService.insert(oilSuppliers));
}
@ -79,6 +91,13 @@ public class OilSuppliersController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody OilSuppliers oilSuppliers) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("更新油站供应商的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilSuppliersService.update(oilSuppliers));
}
@ -90,6 +109,13 @@ public class OilSuppliersController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油站进油");
sysLog.setContent("删除油站供应商的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilSuppliersService.deleteById(id));
}

33
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilTankController.java
View File

@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.petrolStationManagement.entity.OilTank;
import com.fuint.business.petrolStationManagement.service.OilTankService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -27,6 +30,8 @@ public class OilTankController extends BaseController {
*/
@Resource
private OilTankService oilTankService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -88,6 +93,13 @@ public class OilTankController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody OilTank oilTank) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油罐信息");
sysLog.setContent("新增油站油罐的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilTankService.insert(oilTank));
}
@ -99,6 +111,13 @@ public class OilTankController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody OilTank oilTank) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油罐信息");
sysLog.setContent("更新油站油罐的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilTankService.update(oilTank));
}
@ -110,6 +129,13 @@ public class OilTankController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油罐信息");
sysLog.setContent("删除油站油罐的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilTankService.deleteById(id));
}
@ -120,6 +146,13 @@ public class OilTankController extends BaseController {
*/
@GetMapping("cleanTank")
public ResponseObject cleanData(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("油罐信息");
sysLog.setContent("重置油站油罐的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilTankService.cleanData(id));
}

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/PrintDeviceInfoController.java
View File

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.printer.entity.PrintDeviceInfo;
import com.fuint.business.printer.service.PrintDeviceInfoService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +29,8 @@ public class PrintDeviceInfoController extends BaseController {
*/
@Resource
private PrintDeviceInfoService printDeviceInfoService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -64,6 +69,13 @@ public class PrintDeviceInfoController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody PrintDeviceInfo printDeviceInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("打印机管理");
sysLog.setContent("新增打印机的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.printDeviceInfoService.insert(printDeviceInfo));
}
@ -75,7 +87,13 @@ public class PrintDeviceInfoController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody PrintDeviceInfo printDeviceInfo) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("打印机管理");
sysLog.setContent("更新打印机的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.printDeviceInfoService.update(printDeviceInfo));
}
@ -87,6 +105,13 @@ public class PrintDeviceInfoController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("打印机管理");
sysLog.setContent("删除打印机的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.printDeviceInfoService.deleteById(id));
}

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/qrCode/controller/QrCodeController.java
View File

@ -1,6 +1,8 @@
package com.fuint.business.qrCode.controller;
import com.fuint.business.qrCode.service.QrCodeService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,6 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
public class QrCodeController extends BaseController {
@Autowired
private QrCodeService qrCodeService;
@Autowired
private SysLogService sysLogService;
/**
* 生成条形码信息
@ -23,6 +27,13 @@ public class QrCodeController extends BaseController {
*/
@GetMapping("/createBarCode")
public ResponseObject createBarCode(){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("二维码信息");
sysLog.setContent("生成二维码信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(qrCodeService.createUserBarCode());
}
@ -32,6 +43,13 @@ public class QrCodeController extends BaseController {
*/
@GetMapping("/createQrCode")
public ResponseObject createQrCode(){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("二维码信息");
sysLog.setContent("生成二维码信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(qrCodeService.createUserQrCode());
}
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/record/controller/RocketmqRecordController.java
View File

@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.record.entity.RocketmqRecord;
import com.fuint.business.record.service.RocketmqRecordService;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +28,8 @@ public class RocketmqRecordController extends BaseController {
*/
@Resource
private RocketmqRecordService rocketmqRecordService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/HardwareStoreController.java
View File

@ -57,6 +57,7 @@ public class HardwareStoreController extends BaseController {
if (!StringUtils.isEmpty(hardwareStore.getCategoryName())){
hardwareStoreQueryWrapper.eq(HardwareStore::getCategoryName,hardwareStore.getCategoryName());
}
hardwareStoreQueryWrapper.orderByDesc(HardwareStore::getCreateTime);
return getSuccessResult(this.hardwareStoreService.page(page, hardwareStoreQueryWrapper));
}

46
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/MessageTemplateController.java
View File

@ -2,21 +2,27 @@ package com.fuint.business.setting.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.setting.entity.MessageTemplate;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.MessageTemplateService;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.StringUtils;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import com.fuint.system.dept.entity.SysDept;
import com.fuint.system.dept.service.ISysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
@ -35,6 +41,8 @@ public class MessageTemplateController extends BaseController {
private MessageTemplateService messageTemplateService;
@Autowired
private SysLogService sysLogService;
@Autowired
private ISysDeptService deptService;
/**
* 分页查询所有数据
*
@ -44,7 +52,23 @@ public class MessageTemplateController extends BaseController {
*/
@GetMapping
public ResponseObject selectAll(Page<MessageTemplate> page, MessageTemplate messageTemplate) {
return getSuccessResult(this.messageTemplateService.page(page, new QueryWrapper<>(messageTemplate)));
LambdaQueryWrapper<MessageTemplate> queryWrapper =new LambdaQueryWrapper<>();
if (!StringUtils.isEmpty(messageTemplate.getName())){
queryWrapper.like(MessageTemplate::getName,messageTemplate.getName());
}
if (!StringUtils.isEmpty(messageTemplate.getStatus())){
queryWrapper.eq(MessageTemplate::getStatus,messageTemplate.getStatus());
}
queryWrapper.orderByDesc(MessageTemplate::getCreateTime);
IPage<MessageTemplate> page1 = this.messageTemplateService.page(page,queryWrapper);
for (MessageTemplate record : page1.getRecords()) {
List<Integer> deptIdList =new ArrayList<>();
for (String s : record.getDeptIds().split(",")) {
deptIdList.add(Integer.parseInt(s));
}
record.setDeptIdList(deptIdList);
}
return getSuccessResult(page1);
}
/**
@ -73,6 +97,16 @@ public class MessageTemplateController extends BaseController {
sysLog.setMoudle("短信模版");
sysLog.setContent("新增了模版名称为"+messageTemplate.getName()+"的数据");
sysLogService.saveVo(sysLog);
String tempName = "";
String tempId = "";
for (Integer deptId : messageTemplate.getDeptIdList()) {
SysDept dept = deptService.getById(deptId);
tempName+=dept.getDeptName()+",";
tempId+=dept.getDeptId()+",";
}
messageTemplate.setDeptNames(tempName.substring(0,tempName.length()-1));
messageTemplate.setDeptIds(tempId.substring(0,tempId.length()-1));
return getSuccessResult(this.messageTemplateService.save(messageTemplate));
}
@ -89,6 +123,16 @@ public class MessageTemplateController extends BaseController {
sysLog.setMoudle("短信模版");
sysLog.setContent("更新了模版名称为"+messageTemplate.getName()+"的数据");
sysLogService.saveVo(sysLog);
String tempName = "";
String tempId = "";
for (Integer deptId : messageTemplate.getDeptIdList()) {
SysDept dept = deptService.getById(deptId);
tempName+=dept.getDeptName()+",";
tempId+=dept.getDeptId()+",";
}
messageTemplate.setDeptNames(tempName.substring(0,tempName.length()-1));
messageTemplate.setDeptIds(tempId.substring(0,tempId.length()-1));
return getSuccessResult(this.messageTemplateService.updateById(messageTemplate));
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/controller/SysLogController.java
View File

@ -62,6 +62,7 @@ public class SysLogController extends BaseController {
if (!ObjectUtils.isEmpty(sysLog.getEndTime())){
sysLogLambdaQueryWrapper.le(SysLog::getCreateTime, DateUtil.format(sysLog.getEndTime(),"yyyy-MM-dd")+" 23:59:59");
}
sysLogLambdaQueryWrapper.orderByDesc(SysLog::getCreateTime);
return getSuccessResult(this.sysLogService.page(page, sysLogLambdaQueryWrapper));
}

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageTemplate.java
View File

@ -3,11 +3,14 @@ package com.fuint.business.setting.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* (MessageTemplate)表实体类
@ -33,6 +36,7 @@ public class MessageTemplate extends Model<MessageTemplate> {
//创建者名称
private String createName;
//创建时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
//创建人
private String createBy;
@ -41,7 +45,10 @@ public class MessageTemplate extends Model<MessageTemplate> {
//更新人
private String updateBy;
//短信模板id
private Integer messageId;
private String messageId;
@TableField(exist = false)
private List<Integer> deptIdList;
private String deptNames;
}

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
View File

@ -1,6 +1,8 @@
package com.fuint.business.storeInformation.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.entity.QRCode;
import com.fuint.business.storeInformation.service.ILJStoreService;
@ -19,6 +21,8 @@ import java.util.Map;
public class LJStoreController extends BaseController {
@Autowired
private ILJStoreService storeService;
@Autowired
private SysLogService sysLogService;
/**
* 根据id查询门店信息
@ -72,6 +76,13 @@ public class LJStoreController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@Validated @RequestBody LJStore store){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("油站管理");
sysLog.setContent("更新店铺名称为"+store.getName()+"的店铺");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(storeService.updateStore(store));
}

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
View File

@ -2,6 +2,8 @@ package com.fuint.business.storeInformation.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.storeInformation.entity.QRCode;
import com.fuint.business.storeInformation.service.IQRCodeService;
import com.fuint.framework.web.BaseController;
@ -18,6 +20,8 @@ import java.util.Map;
public class QRCodeController extends BaseController {
@Autowired
private IQRCodeService iqrCodeService;
@Autowired
private SysLogService sysLogService;
/**
* 根据条件分页查询二维码信息
@ -38,11 +42,25 @@ public class QRCodeController extends BaseController {
@PostMapping("/createStoreQrCode")
public ResponseObject createStoreQrCode(HttpServletRequest request, @RequestBody Map<String,String> map) throws Exception {
String type = map.get("type");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("店铺二维码");
sysLog.setContent("创建店铺二维码");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(iqrCodeService.createStoreQrCode(type,request));
}
@PostMapping("/createStoreQrCodeByPos")
public ResponseObject createStoreQrCodeByPos(HttpServletRequest request, @RequestBody Map<String,String> map) throws Exception {
String type = map.get("type");
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("店铺二维码");
sysLog.setContent("创建店铺二维码");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(iqrCodeService.createStoreQrCodeByPos(type,request));
}
@ -73,6 +91,13 @@ public class QRCodeController extends BaseController {
@GetMapping("/add")
public ResponseObject addQrCode(){
QRCode qrCode = new QRCode();
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("店铺二维码");
sysLog.setContent("添加门店二维码信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(iqrCodeService.insertQRCode(qrCode,null));
}
@ -93,6 +118,13 @@ public class QRCodeController extends BaseController {
*/
@PostMapping
public ResponseObject add(@Validated @RequestBody QRCode qrCode){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("店铺二维码");
sysLog.setContent("添加门店二维码信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(iqrCodeService.insertQRCode(qrCode,null));
}
@ -103,6 +135,13 @@ public class QRCodeController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@Validated @RequestBody QRCode qrCode){
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("店铺二维码");
sysLog.setContent("更新门店二维码信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(iqrCodeService.updateQRCode(qrCode));
}
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysAppController.java
View File

@ -2,10 +2,13 @@ package com.fuint.business.sys.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.sys.entity.SysApp;
import com.fuint.business.sys.service.SysAppService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +29,8 @@ public class SysAppController extends BaseController {
*/
@Resource
private SysAppService sysAppService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -64,6 +69,13 @@ public class SysAppController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody SysApp sysApp) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("小程序配置");
sysLog.setContent("新增小程序配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysAppService.insert(sysApp));
}
@ -75,6 +87,13 @@ public class SysAppController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody SysApp sysApp) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("小程序配置");
sysLog.setContent("更新小程序配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysAppService.update(sysApp));
}
@ -86,6 +105,13 @@ public class SysAppController extends BaseController {
*/
@DeleteMapping("{id}")
public ResponseObject deleteById(@PathVariable("id") Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("小程序配置");
sysLog.setContent("删除小程序配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysAppService.deleteById(id));
}

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysBannerController.java
View File

@ -2,10 +2,13 @@ package com.fuint.business.sys.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.sys.entity.SysBanner;
import com.fuint.business.sys.service.SysBannerService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,6 +29,8 @@ public class SysBannerController extends BaseController {
*/
@Resource
private SysBannerService sysBannerService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
@ -64,6 +69,13 @@ public class SysBannerController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody SysBanner sysBanner) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("banner配置");
sysLog.setContent("新增banner配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysBannerService.insert(sysBanner));
}
@ -75,6 +87,13 @@ public class SysBannerController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody SysBanner sysBanner) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("banner配置");
sysLog.setContent("更新banner配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysBannerService.update(sysBanner));
}
@ -86,6 +105,13 @@ public class SysBannerController extends BaseController {
*/
@DeleteMapping("{id}")
public ResponseObject deleteById(@PathVariable("id") Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("banner配置");
sysLog.setContent("删除banner配置");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysBannerService.deleteById(id));
}

27
fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysNotifyController.java
View File

@ -2,10 +2,13 @@ package com.fuint.business.sys.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.sys.entity.SysNotify;
import com.fuint.business.sys.service.SysNotifyService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.lettuce.core.dynamic.annotation.Param;
@ -26,7 +29,8 @@ public class SysNotifyController extends BaseController {
*/
@Resource
private SysNotifyService sysNotifyService;
@Autowired
private SysLogService sysLogService;
/**
* 分页查询
*
@ -64,6 +68,13 @@ public class SysNotifyController extends BaseController {
*/
@PostMapping
public ResponseObject add(@RequestBody SysNotify sysNotify) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("通知信息");
sysLog.setContent("新增通知信息数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysNotifyService.insert(sysNotify));
}
@ -75,6 +86,13 @@ public class SysNotifyController extends BaseController {
*/
@PutMapping
public ResponseObject edit(@RequestBody SysNotify sysNotify) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("通知信息");
sysLog.setContent("更新通知信息数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysNotifyService.update(sysNotify));
}
@ -86,6 +104,13 @@ public class SysNotifyController extends BaseController {
*/
@DeleteMapping
public ResponseObject deleteById(Integer id) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("通知信息");
sysLog.setContent("删除通知信息数据");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.sysNotifyService.deleteById(id));
}

20
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
View File

@ -4,6 +4,8 @@ package com.fuint.system.dept.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.entity.QRCode;
import com.fuint.business.storeInformation.service.ILJStoreService;
@ -38,6 +40,8 @@ public class SysDeptController extends BaseController
{
@Autowired
private ISysDeptService deptService;
@Autowired
private SysLogService sysLogService;
/**
* 获取部门列表
@ -94,6 +98,11 @@ public class SysDeptController extends BaseController
{
return getFailureResult("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("部门管理");
sysLog.setContent("新增了部门名称为"+dept.getDeptName()+"的数据");
sysLogService.saveVo(sysLog);
int row = deptService.insertDept(dept);
return getSuccessResult(row);
}
@ -133,6 +142,11 @@ public class SysDeptController extends BaseController
}
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
dept.setCreateBy(nowAccountInfo.getId().toString());
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("部门管理");
sysLog.setContent("更新了部门名称为"+dept.getDeptName()+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(deptService.updateDept(dept));
}
@ -152,6 +166,12 @@ public class SysDeptController extends BaseController
{
return getFailureResult("部门存在用户,不允许删除");
}
SysDept dept = deptService.getById(deptId);
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("部门管理");
sysLog.setContent("更新了部门名称为"+dept.getDeptName()+"的数据");
sysLogService.saveVo(sysLog);
// 删除store表的dept
storeService.ifDeleteByDeptId(deptId);
return getSuccessResult(deptService.deleteDeptById(deptId));

27
fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
View File

@ -1,6 +1,8 @@
package com.fuint.system.role.controller;
import cn.hutool.core.util.ObjectUtil;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.common.service.AccountService;
import com.fuint.common.util.Constants;
import com.fuint.common.dto.AccountDto;
@ -54,7 +56,8 @@ public class BackendDutyController extends BaseController {
@Autowired
private AccountService accountService;
@Autowired
private SysLogService sysLogService;
/**
* 角色列表
*
@ -183,7 +186,11 @@ public class BackendDutyController extends BaseController {
} catch (Exception e) {
return getFailureResult(201, e.getMessage());
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("角色信息");
sysLog.setContent("新增了角色信息的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(true);
}
@ -286,7 +293,11 @@ public class BackendDutyController extends BaseController {
} catch (Exception e) {
return getFailureResult(201, e.getMessage());
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("角色信息");
sysLog.setContent("更新了角色信息的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(true);
}
@ -310,6 +321,11 @@ public class BackendDutyController extends BaseController {
} catch (BusinessRuntimeException e) {
return getFailureResult(201, e.getMessage() == null ? "角色删除失败" : e.getMessage());
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("角色信息");
sysLog.setContent("删除了角色信息的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(true);
}
@ -334,6 +350,11 @@ public class BackendDutyController extends BaseController {
} catch (BusinessCheckException e) {
return getFailureResult(201, e.getMessage() == null ? "操作失败" : e.getMessage());
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("角色信息");
sysLog.setContent("更新了角色信息的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(true);
}
}

20
fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
View File

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.setting.entity.SysLog;
import com.fuint.business.setting.service.SysLogService;
import com.fuint.business.store.mapper.MtStoreMapper;
import com.fuint.common.dto.AccountDto;
import com.fuint.common.dto.AccountInfo;
@ -77,6 +79,8 @@ public class BackendAccountController extends BaseController {
*/
@Autowired
private MerchantService merchantService;
@Autowired
private SysLogService sysLogService;
/**
* 账户信息列表
@ -186,7 +190,11 @@ public class BackendAccountController extends BaseController {
@CrossOrigin
public ResponseObject doCreate(HttpServletRequest request, @RequestBody Map<String, Object> param) {
boolean flag = tAccountService.doCreate(param);
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("用户信息");
sysLog.setContent("新增了用户名称为"+param.get("accountName")+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(flag);
}
@ -201,6 +209,11 @@ public class BackendAccountController extends BaseController {
@CrossOrigin
public ResponseObject update(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
tAccountService.update(param);
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("用户信息");
sysLog.setContent("更新了用户名称为"+param.get("accountName")+"的数据");
sysLogService.saveVo(sysLog);
return getSuccessResult(true);
}
@ -242,6 +255,11 @@ public class BackendAccountController extends BaseController {
}
}
}
SysLog sysLog =new SysLog();
sysLog.setSystemName("1");
sysLog.setMoudle("用户信息");
sysLog.setContent("删除了用户信息");
sysLogService.saveVo(sysLog);
return getSuccessResult(true);
}