大后台操作日志

src/main/java/common/controller/ContractController.java

@@ -2,7 +2,6 @@ package common.controller;
 
 import common.model.*;
 import common.service.ContractService;
-import common.task.ContractSendEmailThread;
 import dic.ContractStatusEnum;
 import dic.OperateObjectTypeEnum;
 import org.apache.commons.io.IOUtils;
@@ -14,9 +13,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
+import util.IPAddrUtil;
 import util.NewUserLogThread;
 import util.ResultModel;
 import util.ValidateUtil;
@@ -220,7 +219,9 @@ public class ContractController {
     @RequestMapping(value = "update", method = RequestMethod.PUT)
     @ResponseBody
     public ResultModel update(@CurrentAccount User loginAccount, @RequestBody Contract contract, HttpServletRequest request, @PathVariable String platform) {
-        Contract contract1 = service.update(loginAccount, contract);
+
+        String ip = IPAddrUtil.getIpAddrNew(request);
+        Contract contract1 = service.update(loginAccount, contract,ip);
         NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改合同","",contract1.toString(), request, platform);
         userlog.start();
 
@@ -278,9 +279,12 @@ public class ContractController {
 
     @RequestMapping(value = "update/pay", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request, @PathVariable String platform) {
-        Contract contract1 = service.updatePay(loginAccount, contract);
-        NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改收款开票","", service.updatePay(loginAccount, contract).toString(), request, platform);
+    public ResultModel updatePay(@CurrentAccount User loginAccount, @RequestBody ContractMoney contract, HttpServletRequest request,
+                                 @PathVariable String platform) {
+
+        String ip = IPAddrUtil.getIpAddrNew(request);
+        Contract contract1 = service.updatePay(loginAccount, contract,ip);
+        NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改收款开票","", contract1.toString(), request, platform);
         userlog.start();
         return ResultModel.OK(contract1);
     }
@@ -317,9 +321,11 @@ public class ContractController {
 
     @RequestMapping(value = "setstaus", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel contractStatusUpdate( @PathVariable String platform,String contractId,String status) {
+    public ResultModel contractStatusUpdate( @PathVariable String platform,@CurrentAccount User loginUser,
+                                             String contractId,String status,HttpServletRequest request) {
 
-        return ResultModel.OK(service.contractStatusUpdate(platform,contractId,status));
+        String ip = IPAddrUtil.getIpAddrNew(request);
+        return ResultModel.OK(service.contractStatusUpdate(platform,contractId,status,ip,loginUser));
     }
 
 
@@ -339,12 +345,16 @@ public class ContractController {
      */
     @RequestMapping(value = "change/del", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel changesDel( @PathVariable String platform,String id,String type) {
+    public ResultModel changesDel( @PathVariable String platform,@CurrentAccount User loginAccount,
+                                   String id,String type,HttpServletRequest request) {
+
+        return ResultModel.OK(service.changesDel(platform,id,type, IPAddrUtil.getIpAddrNew(request),loginAccount));
 
-        return ResultModel.OK(service.changesDel(platform,id,type));
     }
 
 
 
 
+
+
 }

src/main/java/common/controller/UserLogController.java

@@ -2,16 +2,15 @@ package common.controller;
 
 import common.model.User;
 import common.model.UserLog;
+import common.service.ContractService;
 import common.service.UserLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import util.ResultModel;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -23,10 +22,33 @@ public class UserLogController
 {
     @Autowired UserLogService userLogService;
 
+    @Autowired
+    private ContractService service;
+
     ///api/userlog/list?startDate=2017-12-26&endDate=2017-12-27
     @RequestMapping(value = "list", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel findByDS(@CurrentAccount User user, @RequestParam String startDate, @RequestParam String endDate) {
         return ResultModel.OK(userLogService.findUserLog(user,startDate, endDate));
     }
+
+
+
+    @RequestMapping(value = "change/del/info", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultModel getChangeDelData(@PathVariable String platform, @CurrentAccount User loginAccount,
+                                        HttpServletRequest request,
+                                        String contranctCode) {
+
+        return ResultModel.OK(service.getChangeDelData(platform,loginAccount,contranctCode));
+    }
+
+    @RequestMapping(value = "change/del/detail", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultModel getChangeDelDetail( @PathVariable String platform,@CurrentAccount User loginAccount,
+                                           String pid) {
+
+        return ResultModel.OK(service.getChangeDelDetailData(platform,loginAccount,pid));
+    }
+
 }

src/main/java/common/model/ChangeDelDetail.java

+package common.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.util.Date;
+
+
+@Entity
+public class ChangeDelDetail {
+
+    private Long id;
+    private String contractCode;
+    private String email; //客户主账号
+    private Long parentId;
+    private Date creatTime;
+    private String item;
+    private String detail;
+    private String beforeValue;
+    private String afterValue;
+    private String filedName;
+
+    @Id
+    @GeneratedValue
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getContractCode() {
+        return contractCode;
+    }
+
+    public void setContractCode(String contractCode) {
+        this.contractCode = contractCode;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getBeforeValue() {
+        return beforeValue;
+    }
+
+    public void setBeforeValue(String beforeValue) {
+        this.beforeValue = beforeValue;
+    }
+
+    public String getAfterValue() {
+        return afterValue;
+    }
+
+    public void setAfterValue(String afterValue) {
+        this.afterValue = afterValue;
+    }
+
+    public String getFiledName() {
+        return filedName;
+    }
+
+    public void setFiledName(String filedName) {
+        this.filedName = filedName;
+    }
+}

src/main/java/common/model/ChangeDelInfo.java

+package common.model;
+
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Entity
+public class ChangeDelInfo {
+
+    private Long id;
+    private String contractCode;
+    private String email; //客户主账号
+    private int modifyType;
+    private int function;
+    private String detail;
+    private String modifyAccount;
+    private Long modifyId;
+    private Date creatTime;
+    private String ds;
+    private String ip;
+
+    @Id
+    @GeneratedValue
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getContractCode() {
+        return contractCode;
+    }
+
+    public void setContractCode(String contractCode) {
+        this.contractCode = contractCode;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public int getModifyType() {
+        return modifyType;
+    }
+
+    public void setModifyType(int modifyType) {
+        this.modifyType = modifyType;
+    }
+
+    public int getFunction() {
+        return function;
+    }
+
+    public void setFunction(int function) {
+        this.function = function;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getModifyAccount() {
+        return modifyAccount;
+    }
+
+    public void setModifyAccount(String modifyAccount) {
+        this.modifyAccount = modifyAccount;
+    }
+
+    public Long getModifyId() {
+        return modifyId;
+    }
+
+    public void setModifyId(Long modifyId) {
+        this.modifyId = modifyId;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getDs() {
+        return ds;
+    }
+
+    public void setDs(String ds) {
+        this.ds = ds;
+    }
+}

src/main/java/common/model/Sales.java

+package common.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.util.Date;
+
+
+@Entity
+public class Sales {
+
+    private Long id;
+    private String name;
+    private String area;
+    private Date modifyTime;
+    private int status;
+    private int areaType;
+
+    @Id
+    @GeneratedValue
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getAreaType() {
+        return areaType;
+    }
+
+    public void setAreaType(int areaType) {
+        this.areaType = areaType;
+    }
+}

src/main/java/common/repository/ChangeDelDetailRepository.java

+package common.repository;
+
+import common.model.ChangeDelDetail;
+import common.model.ChangeDelInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface ChangeDelDetailRepository extends JpaRepository<ChangeDelDetail, Long> {
+
+
+    @Query(value = "select * from change_del_detail where parent_id = 1? order by creat_time desc ",nativeQuery = true)
+    List<ChangeDelDetail> findByPid(String pid);
+}

src/main/java/common/repository/ChangeDelInfoRepository.java

+package common.repository;
+
+import common.model.ChangeDelInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface ChangeDelInfoRepository  extends JpaRepository<ChangeDelInfo, Long> {
+
+    @Query(value = "select * from change_del_info where contract_code = 1? order by ds desc",nativeQuery = true)
+    List<ChangeDelInfo> findByContract(String contranctCode);
+}

src/main/java/common/repository/ReminderRepository.java

 package common.repository;
 
-import common.model.Auth;
 import common.model.Reminder;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigInteger;
 import java.util.List;
 
 @Transactional

src/main/java/common/repository/SaleAuthRepository.java

 package common.repository;
 
-import common.model.Auth;
 import common.model.SaleAuth;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/common/repository/SalesRepository.java

+package common.repository;
+
+import common.model.Sales;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface SalesRepository extends JpaRepository<Sales, Long> {
+
+    @Query(value = "select * from sales where status = 1? order by area_type,id",nativeQuery = true)
+    List<Sales> findSaleByStatus(Integer status);
+
+
+    @Query(value = "select * from sales where id =1? union all select * from sales where id =2?",nativeQuery = true)
+    List<Sales> findByTwoId(Long sale, Long sale1);
+
+    @Query(value = "select * from sales where status = '0' order by area_type,id",nativeQuery = true)
+    List<Sales> findAllByStatusOn( );
+
+}

src/main/java/common/repository/TradeTypeRepsitory.java

@@ -3,10 +3,15 @@ package common.repository;
 
 import common.model.TradeType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Transactional
 public interface TradeTypeRepsitory extends JpaRepository<TradeType, Long>{
 
 
+    @Query(value = "select * from trade_type where id = 1? union all select * from trade_type where id = 2?",nativeQuery = true)
+    List<TradeType> findByTwoId(int tradeType, int tradenow);
 }

src/main/java/common/service/ContractService.java

@@ -25,11 +25,11 @@ public interface ContractService {
 
     Double getRebat(String product, Integer level, Long money);
 
-    List<User> getSales();
+    List<Sales> getSales();
 
     Contract create(User loginUser, Contract resource);
 
-    Contract update(User loginUser, Contract resource);
+    Contract update(User loginUser, Contract resource, String ip);
 
     List<Contract> findAll(User loginAccount,String startDate, String endDate, String platfrom,String contractId);
 
@@ -43,7 +43,7 @@ public interface ContractService {
 
     List<ContractChange> findChange(String startDate, String endDate, String code);
 
-    Contract updatePay(User loginUser, ContractMoney resource);
+    Contract updatePay(User loginUser, ContractMoney resource, String ip);
 
     List<ContractMoney> findPayAll(String startDate, String endDate, String platform);
 
@@ -57,11 +57,15 @@ public interface ContractService {
 
 //    List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform, String contractId);
 
-    Contract contractStatusUpdate(String platform, String contractId, String status);
+    Contract contractStatusUpdate(String platform, String contractId, String status, String ip, User loginUser);
 
     Map contractCodeCheck(String platform, String contractCode);
 
     List<FlowChange> findflowChange(String startDate, String endDate, String code);
 
-    Object changesDel(String platform, String id, String type);
+    Object changesDel(String platform, String id, String type, String ip, User loginAccount);
+
+    List<ChangeDelInfo> getChangeDelData(String platform, User loginAccount, String contranctCode);
+
+    List<ChangeDelDetail> getChangeDelDetailData(String platform, User loginAccount, String pid);
 }
\ No newline at end of file

src/main/java/dic/ContractStatusEnum.java

@@ -16,6 +16,8 @@ public enum ContractStatusEnum {
     CANCEL("cancel", "作废"),
     DELETE("del", "已删除");
 
+
+
     private String key;
     private String value;
 

src/main/java/tkio/repository/PackageTypeRepository.java

@@ -15,4 +15,7 @@ public interface PackageTypeRepository extends JpaRepository<PackageType, Long>
 
     @Query(value = " select * from package_type where is_new is true ", nativeQuery = true)
     List<PackageType> findIsNewAll();
+
+    @Query(value = "select * from package_type where id =1? union all  select * from package_type where id = 2?",nativeQuery = true)
+    List<PackageType> findByTwoId(Long priceLevel, Long priceLevel1);
 }

src/main/resources/spring/applicationContext-schedule.xml

@@ -10,52 +10,52 @@
     <description>调度配置</description>
 
     <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
-   <task:scheduled-tasks>
-        <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="tkioAccountTask" method="task" cron="0 32 0 * * ?"/>
-    </task:scheduled-tasks>
+   <!--<task:scheduled-tasks>-->
+        <!--&lt;!&ndash;//定时同步短链数据(每5分钟执行一次)&ndash;&gt;-->
+        <!--<task:scheduled ref="tkioAccountTask" method="task" cron="0 32 0 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
-    <task:scheduled-tasks>
-        <task:scheduled ref="tkioNoticeTask" method="task" cron="0 33 0 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--<task:scheduled ref="tkioNoticeTask" method="task" cron="0 33 0 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="emailTask" class="tkio.task.SendEmailTask"></bean>
-    <task:scheduled-tasks>
-        <task:scheduled ref="emailTask" method="task" cron="0 20 0 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--<task:scheduled ref="emailTask" method="task" cron="0 20 0 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="contractTask" class="common.task.ContractTask"></bean>
-    <task:scheduled-tasks>
-        <task:scheduled ref="contractTask" method="task" cron="0 28 0 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--<task:scheduled ref="contractTask" method="task" cron="0 28 0 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="trackAccountTask" class="track.task.AccountTask"></bean>
-    <task:scheduled-tasks>
-        <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="trackAccountTask" method="task" cron="0 32 0 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--&lt;!&ndash;//定时同步短链数据(每5分钟执行一次)&ndash;&gt;-->
+        <!--<task:scheduled ref="trackAccountTask" method="task" cron="0 32 0 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="SyncAppDataTask" class="common.task.SyncAppDataTask"></bean>
 
 
-    <task:scheduled-tasks>
-        <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="SyncAppDataTask" method="syncAppInfo" cron="0 31 0 * * ?"/>
-        <task:scheduled ref="SyncAppDataTask" method="syncAppDeviceNum" cron="0 11 0 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--&lt;!&ndash;//定时同步短链数据(每5分钟执行一次)&ndash;&gt;-->
+        <!--<task:scheduled ref="SyncAppDataTask" method="syncAppInfo" cron="0 31 0 * * ?"/>-->
+        <!--<task:scheduled ref="SyncAppDataTask" method="syncAppDeviceNum" cron="0 11 0 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="ioAccountTask" class="userio.task.IOAccountTask"></bean>
-    <task:scheduled-tasks>
-        <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="ioAccountTask" method="task" cron="0 32 9 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--&lt;!&ndash;//定时同步短链数据(每5分钟执行一次)&ndash;&gt;-->
+        <!--<task:scheduled ref="ioAccountTask" method="task" cron="0 32 9 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <bean id="ioAccountTaskCheck" class="userio.task.IOAccountCheck"></bean>
-    <task:scheduled-tasks>
-        <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="ioAccountTaskCheck" method="task" cron="0 10 8 * * ?"/>
-    </task:scheduled-tasks>
+    <!--<task:scheduled-tasks>-->
+        <!--&lt;!&ndash;//定时同步短链数据(每5分钟执行一次)&ndash;&gt;-->
+        <!--<task:scheduled ref="ioAccountTaskCheck" method="task" cron="0 10 8 * * ?"/>-->
+    <!--</task:scheduled-tasks>-->
 
     <!--<bean id="accountTaskCheck" class="tkio.task.AccountCheck"></bean>-->
     <!--<task:scheduled-tasks>-->