修改积设备管理，油站信息图片上传

yijia-station/src/main/java/com/yijia/station/controller/StationPay111Controller.java

@@ -0,0 +1,191 @@
+package com.yijia.station.controller;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.yijia.common.core.domain.entity.SysDept;
+import com.yijia.common.core.domain.model.LoginUser;
+import com.yijia.common.utils.SecurityUtils;
+import com.yijia.station.domain.StationPic;
+import com.yijia.station.service.IStationPicService;
+import com.yijia.system.service.ISysDeptService;
+import com.yijia.system.service.ISysUserService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.yijia.common.annotation.Log;
+import com.yijia.common.core.controller.BaseController;
+import com.yijia.common.core.domain.AjaxResult;
+import com.yijia.common.enums.BusinessType;
+import com.yijia.station.domain.StationPay;
+import com.yijia.station.service.IStationPayService;
+import com.yijia.common.utils.poi.ExcelUtil;
+import com.yijia.common.core.page.TableDataInfo;
+
+/**
+ * 油站支付设置Controller
+ *
+ * @author yijia
+ * @date 2020-12-10
+ */
+@RestController
+@RequestMapping("/station/pay11")
+public class StationPay111Controller extends BaseController
+{
+    @Autowired
+    private IStationPayService stationPayService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    /**
+     * 查询油站支付设置列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(StationPay stationPay)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
+            stationPay.setStationIdList(list);
+            stationPay.setStationId(null);
+        }
+        startPage();
+        List<StationPay> stationPayList = stationPayService.selectStationPayList(stationPay);
+        return getDataTable(stationPayList);
+    }
+
+    /**
+     * 导出油站支付设置列表
+     */
+    @Log(title = "油站支付设置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(StationPay stationPay)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
+            stationPay.setStationIdList(list);
+            stationPay.setStationId(null);
+        }
+        List<StationPay> stationPayList = stationPayService.selectStationPayList(stationPay);
+        ExcelUtil<StationPay> util = new ExcelUtil<StationPay>(StationPay.class);
+        return util.exportExcel(stationPayList, "pay");
+    }
+
+    /**
+     * 获取油站支付设置详细信息
+     */
+    @GetMapping(value = "/{payId}")
+    public AjaxResult getInfo(@PathVariable("payId") Long payId)
+    {
+        return AjaxResult.success(stationPayService.selectStationPayById(payId));
+    }
+
+    /**
+     * 查询油站支付设置信息
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/queryOne")
+    public AjaxResult queryOne(StationPay stationPay)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        SysDept dept =new SysDept();
+        dept.setDeptId(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.selectDeptId(dept);
+        if(list!=null && list.size()>0){
+            stationPay.setStationIdList(list);
+            stationPay.setStationId(null);
+        }
+        return AjaxResult.success(stationPayService.selectStationPayOne(stationPay));
+    }
+
+    /***
+     * 根据油站id 查询出pay信息
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/{stationId}")
+    public AjaxResult getPayInfo(@PathVariable("stationId") Long stationId)
+    {
+        StationPay stationPay=new StationPay();
+        stationPay.setStationId(stationId);
+        int i=0;
+       List<StationPay> list=stationPayService.selectStationPayList(stationPay);
+        StationPay pay=new StationPay();
+       if(list!=null&&list.size()==1){
+           pay.setPayId(list.get(0).getPayId());
+           pay.setStationId(list.get(0).getStationId());
+           pay.setStationName(list.get(0).getStationName());
+           pay.setCardEnabledFlag(list.get(0).getCardEnabledFlag());
+           pay.setWsPrintFlag(list.get(0).getWsPrintFlag());
+           pay.setPrintSetting(list.get(0).getPrintSetting());
+           pay.setIntegralFlag(list.get(0).getIntegralFlag());
+           pay.setIntegralPrintFlag(list.get(0).getIntegralPrintFlag());
+           pay.setNotice(list.get(0).getNotice());
+       }
+        return AjaxResult.success(pay);
+    }
+
+    /**
+     * 新增油站支付设置
+     */
+    @Log(title = "油站支付设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StationPay stationPay)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPay.setStationId(currentUser.getUser().getDeptId());
+        if(stationPay.getIntegralFlag()==null ||stationPay.getIntegralFlag()==""){
+            stationPay.setIntegralFlag("0");//默认积分功能关闭 1是开启0是关闭
+        }
+        if(stationPay.getIntegralPrintFlag()==null ||stationPay.getIntegralPrintFlag()==""){
+            stationPay.setIntegralPrintFlag("0");//默认积分小票是否打印 1是开启0是关闭
+        }
+        if(stationPay.getCardEnabledFlag()==null ||stationPay.getCardEnabledFlag()==""){
+            stationPay.setCardEnabledFlag("0");//默认电子卡功能关闭 1是开启0是关闭
+        }
+        if(stationPay.getWsPrintFlag()==null ||stationPay.getWsPrintFlag()==""){
+            stationPay.setWsPrintFlag("0");//班结是否打印1是开启0是关闭
+        }
+        if(stationPay.getDiscountSetting()==null ||stationPay.getDiscountSetting()==""){
+            stationPay.setDiscountSetting("0");//默认电子卡功能关闭 1是开启0是关闭
+        }
+        return toAjax(stationPayService.insertStationPay(stationPay));
+    }
+
+    /**
+     * 修改油站支付设置
+     */
+    @Log(title = "油站支付设置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StationPay stationPay)
+    {
+        LoginUser currentUser = SecurityUtils.getLoginUser();
+        stationPay.setStationId(currentUser.getUser().getDeptId());
+        return toAjax(stationPayService.updateStationPay(stationPay));
+    }
+
+    /**
+     * 删除油站支付设置
+     */
+    @Log(title = "油站支付设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{payIds}")
+    public AjaxResult remove(@PathVariable Long[] payIds)
+    {
+        return toAjax(stationPayService.deleteStationPayByIds(payIds));
+    }
+
+}

yijia-station/src/main/java/com/yijia/station/controller/StationPayController.java

@@ -5,17 +5,16 @@ import com.yijia.common.core.controller.BaseController;
 import com.yijia.common.core.domain.AjaxResult;
 import com.yijia.common.core.domain.entity.SysDept;
 import com.yijia.common.core.domain.model.LoginUser;
-import com.yijia.common.core.page.TableDataInfo;
 import com.yijia.common.enums.BusinessType;
 import com.yijia.common.utils.SecurityUtils;
-import com.yijia.common.utils.poi.ExcelUtil;
-import com.yijia.station.domain.StationPay;
-import com.yijia.station.service.IStationPayService;
+import com.yijia.station.domain.StationPic;
+import com.yijia.station.domain.SysDeptDemo;
 import com.yijia.system.service.ISysDeptService;
-import com.yijia.system.service.ISysUserService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -49,7 +48,44 @@ public class StationPayController extends BaseController
     public AjaxResult queryOne(SysDept sysDept)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        return AjaxResult.success(sysDeptService.selectDeptById(currentUser.getUser().getDeptId()));
+        SysDeptDemo deptDemo =new SysDeptDemo();
+        SysDept dept= sysDeptService.selectDeptById(currentUser.getUser().getDeptId());
+        if(dept!=null){
+            BeanUtils.copyProperties(dept, deptDemo);
+            List<StationPic> list =new ArrayList<>();
+            if(dept.getImage1()!=null && !dept.getImage1().equals("")){
+                StationPic pic=new StationPic();
+                pic.setName("1");
+                pic.setUrl(dept.getImage1());
+                list.add(pic);
+            }
+            if(dept.getImage2()!=null && !dept.getImage2().equals("")){
+                StationPic pic=new StationPic();
+                pic.setName("2");
+                pic.setUrl(dept.getImage2());
+                list.add(pic);
+            }
+            if(dept.getImage3()!=null && !dept.getImage3().equals("")){
+                StationPic pic=new StationPic();
+                pic.setName("3");
+                pic.setUrl(dept.getImage3());
+                list.add(pic);
+            }
+            if(dept.getImage4()!=null && !dept.getImage4().equals("")){
+                StationPic pic=new StationPic();
+                pic.setName("4");
+                pic.setUrl(dept.getImage4());
+                list.add(pic);
+            }
+            if(dept.getImage5()!=null && !dept.getImage5().equals("")){
+                StationPic pic=new StationPic();
+                pic.setName("5");
+                pic.setUrl(dept.getImage5());
+                list.add(pic);
+            }
+            deptDemo.setImgFileList(list);
+        }
+        return AjaxResult.success(deptDemo);
     }
     /***
      * 根据油站id 查询出油站信息
@@ -66,8 +102,29 @@ public class StationPayController extends BaseController
      */
     @Log(title = "油站设置", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody SysDept sysDept)
-    {
-        return toAjax(sysDeptService.updateDept(sysDept));
+    public AjaxResult edit(@RequestBody SysDeptDemo sysDeptDemo){
+        sysDeptDemo.setImage1("");
+        sysDeptDemo.setImage2("");
+        sysDeptDemo.setImage3("");
+        sysDeptDemo.setImage4("");
+        sysDeptDemo.setImage5("");
+        if(sysDeptDemo.getImgFileList()!=null && sysDeptDemo.getImgFileList().size()>0){
+            for(int i=0;i<sysDeptDemo.getImgFileList().size();i++){
+                if(i==0){
+                    sysDeptDemo.setImage1(sysDeptDemo.getImgFileList().get(i).getUrl());
+                }else if(i==1){
+                    sysDeptDemo.setImage2(sysDeptDemo.getImgFileList().get(i).getUrl());
+                }else if(i==2){
+                    sysDeptDemo.setImage3(sysDeptDemo.getImgFileList().get(i).getUrl());
+                }else if(i==3){
+                    sysDeptDemo.setImage4(sysDeptDemo.getImgFileList().get(i).getUrl());
+                }else if(i==4){
+                    sysDeptDemo.setImage5(sysDeptDemo.getImgFileList().get(i).getUrl());
+                }
+            }
+        }
+        SysDept dept = new SysDept();
+        BeanUtils.copyProperties(sysDeptDemo, dept);
+        return toAjax(sysDeptService.updateDept(dept));
     }
 }

yijia-station/src/main/java/com/yijia/station/controller/StationPicController.java

@@ -76,8 +76,6 @@ public class StationPicController extends BaseController
     public AjaxResult add(@RequestBody StationPic stationPic)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        stationPic.setStationId(currentUser.getUser().getDeptId());
-        stationPic.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPicService.insertStationPic(stationPic));
     }
 
@@ -89,8 +87,6 @@ public class StationPicController extends BaseController
     public AjaxResult edit(@RequestBody StationPic stationPic)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        stationPic.setStationId(currentUser.getUser().getDeptId());
-        stationPic.setStationName(currentUser.getUser().getDept().getDeptName());
         return toAjax(stationPicService.updateStationPic(stationPic));
     }
 

yijia-station/src/main/java/com/yijia/station/domain/StationPic.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * 油站支付管理图片对象 station_pic
- * 
+ *
  * @author yijia
  * @date 2021-03-19
  */
@@ -28,73 +28,33 @@ public class StationPic extends BaseEntity
     @Excel(name = "图片地址")
     private String url;
 
-    /** 油站ID */
-    @Excel(name = "油站ID")
-    private Long stationId;
-
-    /** 油站名称 */
-    @Excel(name = "油站名称")
-    private String stationName;
-
-    /** 支付管理id */
-    @Excel(name = "支付管理id")
-    private Long parentId;
-
-
     public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setUrl(String url) 
+    public void setUrl(String url)
     {
         this.url = url;
     }
 
-    public String getUrl() 
+    public String getUrl()
     {
         return url;
     }
-    public void setStationId(Long stationId) 
-    {
-        this.stationId = stationId;
-    }
-
-    public Long getStationId() 
-    {
-        return stationId;
-    }
-    public void setStationName(String stationName) 
-    {
-        this.stationName = stationName;
-    }
-
-    public String getStationName() 
-    {
-        return stationName;
-    }
-    public void setParentId(Long parentId) 
-    {
-        this.parentId = parentId;
-    }
-
-    public Long getParentId() 
-    {
-        return parentId;
-    }
 
     @Override
     public String toString() {
@@ -102,9 +62,6 @@ public class StationPic extends BaseEntity
             .append("id", getId())
             .append("name", getName())
             .append("url", getUrl())
-            .append("stationId", getStationId())
-            .append("stationName", getStationName())
-            .append("parentId", getParentId())
             .toString();
     }
 }

yijia-system/src/main/java/com/yijia/system/domain/SysDeptDemo.java → yijia-station/src/main/java/com/yijia/station/domain/SysDeptDemo.java

@@ -1,4 +1,4 @@
-package com.yijia.system.domain;
+package com.yijia.station.domain;
 
 import com.yijia.common.core.domain.BaseEntity;
 import com.yijia.common.core.domain.entity.SysDept;
@@ -59,6 +59,7 @@ public class SysDeptDemo extends BaseEntity {
     private List<SysDept> children = new ArrayList<SysDept>();
 
     private List<String> deptIdList;
+    private List<StationPic> imgFileList;
 
     private Long orDeptId;
     /** 该油站的优惠方案：0，不执行优惠方案；1，满减；2，立减；3，直降； */
@@ -92,6 +93,14 @@ public class SysDeptDemo extends BaseEntity {
     /**优惠劵是否共享*/
     private String  couponFlag;
 
+    public List<StationPic> getImgFileList() {
+        return imgFileList;
+    }
+
+    public void setImgFileList(List<StationPic> imgFileList) {
+        this.imgFileList = imgFileList;
+    }
+
     public Long getDeptId() {
         return deptId;
     }

yijia-station/src/main/java/com/yijia/station/service/impl/StationPayServiceImpl.java

@@ -64,9 +64,6 @@ public class StationPayServiceImpl implements IStationPayService
         i =stationPayMapper.insertStationPay(stationPay);
         if(stationPay.getImgFileList()!=null && stationPay.getImgFileList().size()>0){
             for(StationPic pic :list){
-                pic.setParentId(stationPay.getPayId());
-                pic.setStationId(stationPay.getStationId());
-                pic.setStationName(stationPay.getStationName());
                 stationPicMapper.insertStationPic(pic);
             }
         }
@@ -88,13 +85,9 @@ public class StationPayServiceImpl implements IStationPayService
         i =stationPayMapper.updateStationPay(stationPay);
         //先删除图片
         StationPic stationPic =new StationPic();
-        stationPic.setParentId(stationPay.getPayId());
         stationPicMapper.deleteStationPay(stationPic);
         if(stationPay.getImgFileList()!=null && stationPay.getImgFileList().size()>0){
             for(StationPic pic :list){
-                pic.setParentId(stationPay.getPayId());
-                pic.setStationId(stationPay.getStationId());
-                pic.setStationName(stationPay.getStationName());
                 stationPicMapper.insertStationPic(pic);
                 System.out.println("打印上传图片对象"+ JSON.toJSONString(pic));
             }
@@ -142,8 +135,6 @@ public class StationPayServiceImpl implements IStationPayService
             pay.setIntegralPrintFlag(list.get(0).getIntegralPrintFlag());
             pay.setIntegralFlag(list.get(0).getIntegralFlag());
             StationPic stationPic =new StationPic();
-            stationPic.setStationId(pay.getStationId());
-            stationPic.setParentId(pay.getPayId());
              List<StationPic> stationPicList =stationPicMapper.selectStationPicList(stationPic);
             if(stationPicList!=null && stationPicList.size()>0){
                 pay.setImgFileList(stationPicList);

yijia-station/src/main/resources/mapper/station/StationDeviceManageMapper.xml

@@ -19,9 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectStationDeviceManageVo">
-        select device_id, device_no, device_name, station_id, station_name, device_type, device_serial_num, gun_no,
+        select device_id, device_no, device_name, station_id,d.dept_name as station_name, device_type, device_serial_num, gun_no,
         pos_fanout_exchange, pos_queue, device_factory
-        from station_device_manage m join sys_dept d on m.
+        from station_device_manage m join sys_dept d on m.station_id = d.dept_id
     </sql>
 
     <select id="selectStationDeviceManageList" parameterType="StationDeviceManage" resultMap="StationDeviceManageResult">
@@ -30,7 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
             <if test="deviceSerialNum != null  and deviceSerialNum != ''"> and device_serial_num = #{deviceSerialNum}</if>
             <if test="gunNo != null  and gunNo != ''"> and gun_no = #{gunNo}</if>
@@ -38,14 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="posFanoutExchange != null  and posFanoutExchange != ''"> and pos_fanout_exchange = #{posFanoutExchange}</if>
             <if test="posQueue != null  and posQueue != ''"> and pos_queue = #{posQueue}</if>
             <if test="stationIdList != null ">
-                and station_id in
+                 and m.station_id in
                 <foreach item="item" index="index" collection="stationIdList"
                          open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
         </where>
-        order by device_id desc
+         order by device_id desc
     </select>
 
     <select id="selectStationDeviceManageById" parameterType="Long" resultMap="StationDeviceManageResult">