edit indexVO

src/main/java/com/xc/controller/backend/AdminPositionController.java

@@ -38,10 +38,10 @@ public class AdminPositionController {
     public ServerResponse list(@RequestParam(value = "agentId", required = false) Integer agentId,
                                @RequestParam(value = "positionType", required = false) Integer positionType,
                                @RequestParam(value = "state", required = false) Integer state,
-                               @RequestParam(value = "userId", required = false) Integer userId,
+                               @RequestParam(value = "nickName", required = false) String nickName,
                                @RequestParam(value = "positionSn", required = false) String positionSn,
                                @RequestParam(value = "beginTime", required = false) String beginTime, @RequestParam(value = "endTime", required = false) String endTime, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "12") int pageSize, HttpServletRequest request) {
-        return this.iUserPositionService.listByAdmin(agentId, positionType, state, userId, positionSn, beginTime, endTime, pageNum, pageSize);
+        return this.iUserPositionService.listByAdmin(agentId, positionType, state, nickName, positionSn, beginTime, endTime, pageNum, pageSize);
     }
 
     //持仓管理 强制平仓操作

src/main/java/com/xc/dao/UserPositionMapper.java

@@ -31,7 +31,7 @@ public interface UserPositionMapper {
 
   List findPositionByUserIdAndSellIdIsNull(Integer paramInteger);
 
-  List listByAgent(@Param("positionType") Integer positionType, @Param("state") Integer state, @Param("userId") Integer userId, @Param("searchId") Integer searchId, @Param("positionSn") String positionSn, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
+  List<UserPosition> listByAgent(@Param("positionType") Integer positionType, @Param("state") Integer state, @Param("nickName") String nickName, @Param("searchId") Integer searchId, @Param("positionSn") String positionSn, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
 
   List findAllStayPosition();
 

src/main/java/com/xc/pojo/IndexInfo.java

@@ -35,4 +35,5 @@ public class IndexInfo {
     private String transAmEnd; // 上午交易结束时间
     private String transPmBegin; // 下午交易开始时间
     private String transPmEnd; // 下午交易结束时间
+    private Integer siteLever;
 }

src/main/java/com/xc/service/IUserPositionService.java

@@ -32,11 +32,11 @@ public interface IUserPositionService {
 
     Integer findPositionNumByTimes(int paramInt, Integer paramInteger);
 
-    ServerResponse listByAgent(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, Integer paramInteger4, String paramString1, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest, int paramInt1, int paramInt2);
+    ServerResponse listByAgent(Integer paramInteger1, Integer paramInteger2, String paramInteger3, Integer paramInteger4, String paramString1, String paramString2, String paramString3, HttpServletRequest paramHttpServletRequest, int paramInt1, int paramInt2);
 
     ServerResponse getIncome(Integer paramInteger1, Integer paramInteger2, String paramString1, String paramString2);
 
-    ServerResponse listByAdmin(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, Integer paramInteger4, String paramString1, String paramString2, String paramString3, int paramInt1, int paramInt2);
+    ServerResponse listByAdmin(Integer paramInteger1, Integer paramInteger2, Integer paramInteger3, String paramInteger4, String paramString1, String paramString2, String paramString3, int paramInt1, int paramInt2);
 
     int CountPositionNum(Integer paramInteger1, Integer paramInteger2);
 

src/main/java/com/xc/service/impl/UserPositionServiceImpl.java

@@ -1163,7 +1163,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
         return transNum;
     }
 
-    public ServerResponse listByAgent(Integer positionType, Integer state, Integer userId, Integer agentId, String positionSn, String beginTime, String endTime, HttpServletRequest request, int pageNum, int pageSize) {
+    public ServerResponse listByAgent(Integer positionType, Integer state, String nickName, Integer agentId, String positionSn, String beginTime, String endTime, HttpServletRequest request, int pageNum, int pageSize) {
         AgentUser currentAgent = this.iAgentUserService.getCurrentAgent(request);
         if (agentId != null) {
             AgentUser agentUser = this.agentUserMapper.selectByPrimaryKey(agentId);
@@ -1201,7 +1201,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
             }
             indexMap.put(indexInfo.getCnName(), indexInfo);
         }
-        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, searchId, positionSn, begin_time, end_time);
+        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, nickName, searchId, positionSn, begin_time, end_time);
         List<AgentPositionVO> agentPositionVOS = Lists.newArrayList();
         for (UserPosition position : userPositions) {
             AgentPositionVO agentPositionVO = assembleAgentPositionVO(position, state, indexMap);
@@ -1276,7 +1276,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
         return ServerResponse.createBySuccess(agentIncomeVO);
     }
 
-    public ServerResponse listByAdmin(Integer agentId, Integer positionType, Integer state, Integer userId, String positionSn, String beginTime, String endTime, int pageNum, int pageSize) {
+    public ServerResponse listByAdmin(Integer agentId, Integer positionType, Integer state, String nickName, String positionSn, String beginTime, String endTime, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         Timestamp begin_time = null;
         if (StringUtils.isNotBlank(beginTime)) {
@@ -1286,7 +1286,7 @@ public class UserPositionServiceImpl implements IUserPositionService {
         if (StringUtils.isNotBlank(endTime)) {
             end_time = DateTimeUtil.searchStrToTimestamp(endTime);
         }
-        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, agentId, positionSn, begin_time, end_time);
+        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, nickName, agentId, positionSn, begin_time, end_time);
         Map<String, IndexInfo> indexMap = new HashMap<>();
         List<IndexInfo> indexInfoList = stockMapper.selectStockList();
         for (IndexInfo indexInfo : indexInfoList) {

src/main/java/com/xc/vo/stock/IndexInfoVo.java

@@ -20,4 +20,8 @@ public class IndexInfoVo {
     private BigDecimal entryOrdersAgio;
 
     private BigDecimal nowPrice;
+
+    private Integer siteLever;
+
+    private int contractSize; //合约单位
 }

src/main/java/mappers/StockMapper.xml

@@ -605,7 +605,8 @@
             transAmBegin transAmBegin,
             transAmEnd transAmEnd,
             transPmBegin transPmBegin,
-            transPmEnd transPmEnd
+            transPmEnd transPmEnd,
+            site_lever siteLever
         FROM stock
     </select>
 

src/main/java/mappers/UserPositionMapper.xml

@@ -45,14 +45,14 @@
     </constructor>
   </resultMap>
   <sql id="Base_Column_List" >
-    id, position_type, position_sn, user_id, nick_name, agent_id, stock_name, stock_code, 
-    stock_gid, stock_spell, buy_order_id, buy_order_time, buy_order_price, sell_order_id, 
-    sell_order_time, sell_order_price, profit_target_price, stop_target_price, order_direction, 
-    order_num, order_lever, order_total_price, order_fee, order_spread, order_stay_fee, 
+    id, position_type, position_sn, user_id, nick_name, agent_id, stock_name, stock_code,
+    stock_gid, stock_spell, buy_order_id, buy_order_time, buy_order_price, sell_order_id,
+    sell_order_time, sell_order_price, profit_target_price, stop_target_price, order_direction,
+    order_num, order_lever, order_total_price, order_fee, order_spread, order_stay_fee,
     order_stay_days, profit_and_lose, all_profit_and_lose,is_lock,lock_msg,stock_plate,depositFreezeAmt,entryOrders,stop_loss_price stoploss,target_profit_price targetprofit
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from user_position
     where id = #{id,jdbcType=INTEGER}
@@ -71,25 +71,25 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.xc.pojo.UserPosition" >
-    insert into user_position (id, position_type, position_sn, 
-      user_id, nick_name, agent_id, 
-      stock_name, stock_code, stock_gid, 
-      stock_spell, buy_order_id, buy_order_time, 
-      buy_order_price, sell_order_id, sell_order_time, 
-      sell_order_price, profit_target_price, stop_target_price, 
-      order_direction, order_num, order_lever, 
-      order_total_price, order_fee, order_spread, 
-      order_stay_fee, order_stay_days, profit_and_lose, 
+    insert into user_position (id, position_type, position_sn,
+      user_id, nick_name, agent_id,
+      stock_name, stock_code, stock_gid,
+      stock_spell, buy_order_id, buy_order_time,
+      buy_order_price, sell_order_id, sell_order_time,
+      sell_order_price, profit_target_price, stop_target_price,
+      order_direction, order_num, order_lever,
+      order_total_price, order_fee, order_spread,
+      order_stay_fee, order_stay_days, profit_and_lose,
       all_profit_and_lose, is_lock, lock_msg,stock_plate,depositFreezeAmt,entryOrders)
-    values (#{id,jdbcType=INTEGER}, #{positionType,jdbcType=INTEGER}, #{positionSn,jdbcType=VARCHAR}, 
-      #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR}, #{agentId,jdbcType=INTEGER}, 
-      #{stockName,jdbcType=VARCHAR}, #{stockCode,jdbcType=VARCHAR}, #{stockGid,jdbcType=VARCHAR}, 
-      #{stockSpell,jdbcType=VARCHAR}, #{buyOrderId,jdbcType=VARCHAR}, #{buyOrderTime,jdbcType=TIMESTAMP}, 
-      #{buyOrderPrice,jdbcType=DECIMAL}, #{sellOrderId,jdbcType=VARCHAR}, #{sellOrderTime,jdbcType=TIMESTAMP}, 
-      #{sellOrderPrice,jdbcType=DECIMAL}, #{profitTargetPrice,jdbcType=DECIMAL}, #{stopTargetPrice,jdbcType=DECIMAL}, 
-      #{orderDirection,jdbcType=VARCHAR}, #{orderNum,jdbcType=INTEGER}, #{orderLever,jdbcType=INTEGER}, 
-      #{orderTotalPrice,jdbcType=DECIMAL}, #{orderFee,jdbcType=DECIMAL}, #{orderSpread,jdbcType=DECIMAL}, 
-      #{orderStayFee,jdbcType=DECIMAL}, #{orderStayDays,jdbcType=INTEGER}, #{profitAndLose,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=INTEGER}, #{positionType,jdbcType=INTEGER}, #{positionSn,jdbcType=VARCHAR},
+      #{userId,jdbcType=INTEGER}, #{nickName,jdbcType=VARCHAR}, #{agentId,jdbcType=INTEGER},
+      #{stockName,jdbcType=VARCHAR}, #{stockCode,jdbcType=VARCHAR}, #{stockGid,jdbcType=VARCHAR},
+      #{stockSpell,jdbcType=VARCHAR}, #{buyOrderId,jdbcType=VARCHAR}, #{buyOrderTime,jdbcType=TIMESTAMP},
+      #{buyOrderPrice,jdbcType=DECIMAL}, #{sellOrderId,jdbcType=VARCHAR}, #{sellOrderTime,jdbcType=TIMESTAMP},
+      #{sellOrderPrice,jdbcType=DECIMAL}, #{profitTargetPrice,jdbcType=DECIMAL}, #{stopTargetPrice,jdbcType=DECIMAL},
+      #{orderDirection,jdbcType=VARCHAR}, #{orderNum,jdbcType=INTEGER}, #{orderLever,jdbcType=INTEGER},
+      #{orderTotalPrice,jdbcType=DECIMAL}, #{orderFee,jdbcType=DECIMAL}, #{orderSpread,jdbcType=DECIMAL},
+      #{orderStayFee,jdbcType=DECIMAL}, #{orderStayDays,jdbcType=INTEGER}, #{profitAndLose,jdbcType=DECIMAL},
       #{allProfitAndLose,jdbcType=DECIMAL}, #{isLock,jdbcType=INTEGER}, #{lockMsg,jdbcType=VARCHAR},
       #{stockPlate,jdbcType=VARCHAR}, #{depositFreezeAmt,jdbcType=DECIMAL}, #{entryOrders,jdbcType=VARCHAR}
       )
@@ -544,8 +544,8 @@
           and sell_order_id is null and entryOrders = 1
         </if>
       </if>
-      <if test="userId != null and userId != '' ">
-        and user_id = #{userId}
+      <if test="nickName != null and userId != '' ">
+        and nick_name = like CONCAT('%','${nickName}','%')
       </if>
       <if test="positionSn != null and positionSn != '' ">
         and position_sn like CONCAT('%','${positionSn}','%')
@@ -592,9 +592,9 @@
       </if>
     </where>
   </select>
-  
-  
-  
+
+
+
   <select id="CountPositionProfitAndLose" resultType="decimal" parameterType="integer">
     SELECT sum(profit_and_lose) FROM user_position
     WHERE sell_order_id is not null and entryOrders = 0 or entryOrders is null